testability-driver-runner 1.0.2 → 1.0.3

data/lib/tdrunner.rb

@@ -20,6 +20,7 @@
 
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'tdrunner_monitor' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'tdrunner_profile' ) )
+require File.expand_path( File.join( File.dirname( __FILE__ ), 'tdrunner_command_tool' ) )
 require 'yaml'
 
 #Sophisticated Interface for Running Random Automation
@@ -49,7 +50,9 @@ module TDRunner
       elsif args[0]=='--version'
         puts '1.0.0'
       elsif args[0]=='--websi'
-        start_websi()
+        start_websi(args[1, args.size])
+      elsif args[0]=='--cmd'
+        tool = TDRunnerCommandTool.new(args[1, args.size])
       elsif args[0]=='-p'
         profile = TDRunnerProfileLoader.new(args)
         tdrunner_profiles=profile.get_execution_profiles
@@ -63,8 +66,9 @@ module TDRunner
         start_tdrunner(args)
       end
     end
+
     #Start tdrunner web UI
-    def start_websi()
+    def start_websi(args=[])
       websi_dir=[]
       tdrunner_location=File.dirname(__FILE__)
       websi_dir_arr=tdrunner_location.split('/')
@@ -74,11 +78,12 @@ module TDRunner
       websi_path=websi_dir.join('/')
       begin
         Dir.chdir(websi_path+'/websi')
-        system ("ruby script/server")
+        system("ruby", "script/server", *args)
       rescue
       ensure
       end
     end
+
     #Executes the tdrunner command
     #Loads the tdrunner command parameters in to memory for test execution control
     def execute_test_unit_tests(test_parameters)
@@ -180,7 +185,8 @@ module TDRunner
       puts 'tdrunner -e my_execution_profile my_test_folder'
       puts 'tdrunner --ordered -e my_execution_profile my_test_folder'
       puts ''
-      puts 'Create a execution profile of all Test::Unit tests which failed when tests were run using an execution profile:'
+      puts 'Create a execution profile of all Test::Unit tests which failed when tests were'
+      puts 'run using an execution profile:'
       puts 'tdrunner -t my_failed_test_cases.sip -e my_execution_profile my_test_case_folder'
       puts ''
       puts 'Runs tests using a predefined profiles:'
@@ -191,18 +197,44 @@ module TDRunner
       puts 'tdrunner -c C:/tdriver_reports/test_run_yyyyddmmhhss my_test_suite_folder'
       puts ''
       puts ''
-      puts "\t-H i\t\t\tDefines how many hours tdrunner will run i as number of hours."
-      puts "\t-i i\t\t\tDefines how many iterations tdrunner will run the tests i as number of iterations."
-      puts "\t-d \"date time\"\t\tDefines end date and time when tdrunner will stop testing"
-      puts "\t-e execution_profile \tDefines tdrunner to use execution profile for running tests"
-      puts "\t-m execution_profile \tDefines tdrunner to create execution profile without running tests"
-      puts "\t-t execution_profile \tDefines tdrunner to create execution profile of failed Test::Unit tests"
-      puts "\t--teardown\t\tRun test unit teardown only when the testcase is failed."
-      puts "\t--ordered\t\tUse this parameter with execution profile to run tests as they are ordered in the sip file."
-      puts "\t--websi\t\tUse this parameter to start tdrunner web interface which is then found from address http://localhost:3000/websi/"
-      puts "\t-p profile_name\t\tPull commandline arguments from tdrunner.yml which can be defined as strings or arrays."
-      puts "\t--version\t\tShow version."
-      puts "\t-h, --help\t\tYou're looking at it."
+
+      puts "-H i\t\tDefines how many hours tdrunner will run i as number of hours."
+
+      puts "-i i\t\tDefines how many iterations tdrunner will run the tests i as"
+      puts "\t\tnumber of iterations."
+
+      puts "-d \"date time\"\tDefines end date and time when tdrunner will stop testing"
+
+      puts "-e execution_profile"
+      puts "\t\tUse execution profile for running tests"
+
+      puts "-m execution_profile"
+      puts "\t\tCreate execution profile without running tests"
+
+      puts "-t execution_profile"
+      puts "\t\tCreate execution profile of failed Test::Unit tests"
+
+      puts "--cmd sut sut_id httpd server_port [usb powerup|powerdown|reset] [status]"
+      puts "\t\tProbe status of given sut and given httpd server."
+      puts "\t\t(Used by tdrunner_ui.)"
+      puts "--cmd sut sut_id usb powerup|powerdown|reset"
+      puts "\t\tPerform given usb command using given sut."
+      puts "\t\t(Used by tdrunner_ui.)"
+
+      puts "--teardown\tRun test unit teardown only when the testcase is failed."
+
+      puts "--ordered\tUse with execution profile to run tests as they are ordered"
+      puts "\t\tin the sip file."
+
+      puts "--websi [optional arguments]"
+      puts "\t\tStarts tdrunner web interface, by default at URL"
+      puts "\t\thttp://localhost:3000/websi/"
+
+      puts "-p profile_name\tPull commandline arguments from tdrunner.yml which can be"
+      puts "\t\tdefined as strings or arrays."
+
+      puts "--version\tShow version."
+      puts "-h, --help\tYou're looking at it."
     end
   end
 end

data/lib/tdrunner_command_tool.rb

@@ -0,0 +1,137 @@
+############################################################################
+##
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (testabilitydriver@nokia.com)
+##
+## This file is part of Testability Driver.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at testabilitydriver@nokia.com .
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation
+## and appearing in the file LICENSE.LGPL included in the packaging
+## of this file.
+##
+############################################################################
+
+require 'tdriver'
+
+module TDRunner
+  #TDRunner monitor module for controlling the SIERRA execution
+  class TDRunnerCommandTool
+    def initialize(args)
+      @sut_arg = ""
+      @httpd_port = 0
+
+      while not args.empty?
+
+        case arg=args.shift
+
+        when 'httpd' then
+          @httpd_port = args.shift.to_i
+
+        when 'sut' then
+          @sut_arg = args.shift
+
+        when 'usb' then
+          raise "Argument error: sut must be given before 'usb' command" if @sut_arg.empty?
+
+          case arg2=args.shift
+
+          when 'powerup'
+            uperror = ""
+            begin
+              sut = TDriver.sut(:Id => @sut_arg)
+              sut.power_up
+            rescue
+              uperror = " ERROR (#{$!.to_s.gsub(/\s+/, ' ')})"
+            end
+            puts "USB: Power up"+uperror
+
+          when 'powerdown'
+            downerror = ""
+            begin
+              sut = TDriver.sut(:Id => @sut_arg)
+              sut.power_down
+            rescue
+              downerror = " ERROR (#{$!.to_s.gsub(/\s+/, ' ')})"
+            end
+            puts "USB: Power down"+downerror
+
+          when arg+' '+'reset'
+            sut = TDriver.sut(:Id => @sut_arg)
+            sut.reset
+
+          else
+            raise "Argument error: Unrecognized 'usb' subcommand '#{arg2}'"
+
+          end
+          # end of main command 'usb'
+
+        when 'status'
+          if not @sut_arg.empty?
+            sut = TDriver.sut(:Id => @sut_arg)
+            puts "Selected SUT: #{@sut_arg}"
+
+            STDOUT.sync
+            sutstatus=''
+            begin
+              sut.refresh
+              sutstatus="OK"
+            rescue
+              sutstatus = "ERROR (#{$!.to_s.gsub(/\s+/, ' ')})"
+            end
+            puts "SUT connection: #{sutstatus}"
+          else
+            puts "Selected SUT: N/A"
+            puts "SUT connection: N/A"
+          end
+
+          # note: in tdrunner_gui, '?' also has the special meaning of not updating existing value in status display
+          # if line below is changed, tdrunner_gui code needs to be changed accordingly
+          puts "USB: ?"
+
+          STDOUT.sync
+          sutlist=''
+          #paramfilename = '/etc/tdriver/tdriver_params.xml'
+          begin
+            #paramfile = File.new(paramfilename)
+            #sutlist = paramfile.readlines.join.scan(/<sut +id *= *"([^"]+)"/).map{|i| i[0]}.join(' ')
+            sutlist = MobyUtil::ParameterXml.instance.sut_list.reject { |item| item.to_s == 'sut_generic' }.join(' ')
+          rescue
+            #sutlist = "Failed to read '#{paramfilename}': #{$!.to_s.gsub(/\s+/, ' ')}"
+            sutlist = "ERROR (#{$!.to_s.gsub(/\s+/, ' ')})"
+          end
+          puts "Available SUTs: #{sutlist}"
+          # end of main command 'status'
+
+          if @httpd_port > 0
+            httpd_str = "N/A"
+
+            if require('net/http')
+              uri = URI.parse("http://localhost:#{@httpd_port}/")
+              begin
+                response = Net::HTTP.get_response(uri)
+                httpd_str = "ALIVE (#{uri})"
+              rescue
+                httpd_str = "FAILED (#{uri})"
+              end
+            else
+              httpd_str = "ERROR (required ruby gem status: net/http:#{req1} uri:#{req2})"
+            end
+
+            puts "HTTPD: #{httpd_str}"
+          end #httpd status
+
+        else
+          raise "Argument error: Unrecognized command '#{arg}'"
+        end
+
+      end
+
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver-runner
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Testability Driver team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +02:00
+date: 2011-01-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - bin/sierra
 - bin/tdrunner
 - lib/tdrunner_test_unit.rb
+- lib/tdrunner_command_tool.rb
 - lib/tdrunner.rb
 - lib/tdrunner_cucumber_runners.rb
 - lib/tdrunner_file_finder.rb