Menu
▾
▴
stp-svn — Subversion Commit Notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(9) |
May
(20) |
Jun
(7) |
Jul
(30) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(4) |
Feb
(7) |
Mar
(10) |
Apr
(1) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
(4) |
Apr
(3) |
May
(2) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
(2) |
| 2014 |
Jan
(1) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(2) |
Jun
(2) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: <jud...@us...> - 2006-05-23 17:23:30
|
Revision: 283 Author: judith_osdl Date: 2006-05-23 09:53:34 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=283&view=rev Log Message: ----------- Stop the bzip2, most are already gzipped. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/Wsdl.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/Wsdl.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/Wsdl.pm 2006-05-22 19:50:36 UTC (rev 282) +++ trunk/Test-Sut/lib/Test/Sut/Upload/Wsdl.pm 2006-05-23 16:53:34 UTC (rev 283) @@ -127,7 +127,7 @@ sub upload_file { my ( $self, $test_uid, $filename ) = @_; - my $encoded = `bzip2 -c $filename`; + my $encoded = `cat $filename`; $encoded = encode_base64($encoded); if (! $self->{'login'} or !$self->{'pass'} ){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-05-22 19:50:40
|
Revision: 282 Author: markwkm Date: 2006-05-22 12:50:36 -0700 (Mon, 22 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=282&view=rev Log Message: ----------- Fixed the logic when using the pagination links. Modified Paths: -------------- trunk/stp-ror/app/controllers/test_requests_controller.rb Modified: trunk/stp-ror/app/controllers/test_requests_controller.rb =================================================================== --- trunk/stp-ror/app/controllers/test_requests_controller.rb 2006-05-22 19:13:46 UTC (rev 281) +++ trunk/stp-ror/app/controllers/test_requests_controller.rb 2006-05-22 19:50:36 UTC (rev 282) @@ -144,20 +144,20 @@ test_request.each { |key, value| @pagination_link_options["test_request[#{key}]"] = value - } + } if test_request software = params[:software] software.each { |key, value| @pagination_link_options["software[#{key}]"] = value - } + } if software softwares_test_requests = params[:softwares_test_requests] softwares_test_requests.each { |key, value| value = '""' if value.nil? @pagination_link_options["softwares_test_requests[#{key}]"] = value - } + } if softwares_test_requests # # First note that I may be doing this because I don't know how else to use # the Paginate class. @@ -176,37 +176,37 @@ ' tr.test_request_state_id, tr.created_on, tr.updated_on, ' + ' tr.test_case_id, tr.user_id ' - unless test_request[:host_type_id] == 'Any' then + if test_request and test_request[:host_type_id] != 'Any' then condition << "tr.host_type_id = '#{test_request[:host_type_id]}'" end - unless test_request[:distro_id] == 'Any' then + if test_request and test_request[:distro_id] != 'Any' then condition << "tr.distro_id = #{test_request[:distro_id]}" end - unless softwares_test_requests[:patch_name].empty? then + if softwares_test_requests and !softwares_test_requests[:patch_name].empty? then table << 'softwares_test_requests str' condition << 'tr.id = str.test_request_id' condition << "str.patch_name = #{softwares_test_requests[:patch_name]}" end - unless software[:id] == 'Any' then + if software and software[:id] != 'Any' then table << 'softwares_test_requests str' condition << 'tr.id = str.test_request_id' condition << "str.software_id = #{software[:id]}" end - unless test_request[:test_request_state_id] == 'Any' then + if test_request and test_request[:test_request_state_id] != 'Any' then condition << "tr.test_request_state_id = #{test_request[:test_request_state_id]}" end - unless test_request[:test_case_id] == 'Any' then + if test_request and test_request[:test_case_id] != 'Any' then condition << "tr.test_case_id = #{test_request[:test_case_id]}" end user = params[:user] - unless user[:login].empty? then + if user and !user[:login].empty? then table << 'users u' condition << 'tr.user_id = u.id' condition << "u.login = '#{user[:login]}'" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-05-22 19:13:51
|
Revision: 281 Author: judith_osdl Date: 2006-05-22 12:13:46 -0700 (Mon, 22 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=281&view=rev Log Message: ----------- Fix for dual core. Modified Paths: -------------- trunk/Test-Sut/scripts/client/check_system.pl Modified: trunk/Test-Sut/scripts/client/check_system.pl =================================================================== --- trunk/Test-Sut/scripts/client/check_system.pl 2006-05-22 18:28:04 UTC (rev 280) +++ trunk/Test-Sut/scripts/client/check_system.pl 2006-05-22 19:13:46 UTC (rev 281) @@ -61,7 +61,7 @@ chomp( my $cpu_count = `getconf _NPROCESSORS_ONLN` ); die "ERROR: failed to get processor count\n" if ( $? != 0 ); -unless ( $systype eq $cpu_count ) { +unless ( $systype eq $cpu_count or ($systype * 2) eq $cpu_count ) { print "ERROR: only $cpu_count CPU's found, expecting $systype\n"; $sysstate++; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-05-22 18:28:18
|
Revision: 280 Author: judith_osdl Date: 2006-05-22 11:28:04 -0700 (Mon, 22 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=280&view=rev Log Message: ----------- Fix for architecture. Modified Paths: -------------- trunk/Test-Sut/scripts/client/stp_robokern Modified: trunk/Test-Sut/scripts/client/stp_robokern =================================================================== --- trunk/Test-Sut/scripts/client/stp_robokern 2006-05-22 17:49:29 UTC (rev 279) +++ trunk/Test-Sut/scripts/client/stp_robokern 2006-05-22 18:28:04 UTC (rev 280) @@ -51,6 +51,11 @@ log "found $CPU processor(s)" +my_arch=`uname -m` +if [ $my_arch == i686 ] ;then + my_arch=i386 +fi + # We need to see what distro we are on if [ -f request-details ]; then DISTRO_NAME=`grep "Distro Name" request-details | cut -c15-` @@ -143,7 +148,7 @@ fi # We know the build failed if there is no bzImage file -if [ ! -f arch/i386/boot/bzImage ]; then +if [ ! -f arch/$my_arch/boot/bzImage ]; then log MISSING BZIMAGE AFTER BUILD exit 1 fi @@ -152,7 +157,7 @@ if [ -f /boot/System.map-STP ]; then log "PANIC: System.map-STP present, not a clean system." rm -f System.map - rm -f arch/i386/boot/bzImage + rm -f arch/$my_arch/boot/bzImage exit 1 fi @@ -160,14 +165,14 @@ if [ -f /boot/vmlinuz-STP ]; then log "PANIC: vmlinuz-STP present, not a clean system." rm -f System.map - rm -f arch/i386/boot/bzImage + rm -f arch/$my_arch/boot/bzImage exit 1 fi # Install the STP kernel in /boot log "stp_robokern installing the new kernel" cp -a System.map /boot/System.map-STP -cp -a arch/i386/boot/bzImage /boot/vmlinuz-STP +cp -a arch/$my_arch/boot/bzImage /boot/vmlinuz-STP # We are moving lilo out to make it more flexible, ie grub or lilo or etc. # Setup LILO to use the new kernel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-05-22 17:49:44
|
Revision: 279 Author: judith_osdl Date: 2006-05-22 10:49:29 -0700 (Mon, 22 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=279&view=rev Log Message: ----------- Check correct path for architecture when looking for kernel. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Kernel/Plm.pm Modified: trunk/Test-Sut/lib/Test/Sut/Kernel/Plm.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Kernel/Plm.pm 2006-05-19 23:28:40 UTC (rev 278) +++ trunk/Test-Sut/lib/Test/Sut/Kernel/Plm.pm 2006-05-22 17:49:29 UTC (rev 279) @@ -49,8 +49,13 @@ chdir $ENV{ 'EXEC_HOME' }; system "$kernel_build &> $ENV{ 'SYSTEM_LOGS' }/kernel-build.txt"; + my $arch = `uname -m`; + chomp $arch; + if ( $arch =~ m/i686/ ){ + $arch = 'i386'; + } $res = 0 if ( $? ); - $res = 0 unless ( -f "linux/System.map" and -f "linux/arch/i386/boot/bzImage" ); + $res = 0 unless ( -f "linux/System.map" and -f "linux/arch/$arch/boot/bzImage" ); unless ($self->kernel_version()){ $self->{'_ERR'}='compile_kernel'; return 0; } # We are done if there were no errors This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-05-19 23:28:42
|
Revision: 278 Author: judith_osdl Date: 2006-05-19 16:28:40 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=278&view=rev Log Message: ----------- This was failing to check. Modified Paths: -------------- trunk/Test-Sut/scripts/client/stp_client.pl Modified: trunk/Test-Sut/scripts/client/stp_client.pl =================================================================== --- trunk/Test-Sut/scripts/client/stp_client.pl 2006-05-19 23:12:17 UTC (rev 277) +++ trunk/Test-Sut/scripts/client/stp_client.pl 2006-05-19 23:28:40 UTC (rev 278) @@ -128,7 +128,7 @@ if ( $sut->{ 'kernel_install' } =~ m/yes|plm/ ) { my $kar = $sut->getSoftwareInfo( 'linux' ); - if ( ( $kar == -1 ) || ( $kar->[ 0 ] == -1 ) ) { + if ( ( ! $kar ) || ( $kar->[ 0 ] eq '-1' ) ) { $sut->finish( 'no_software_info' ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-05-19 23:12:21
|
Revision: 277 Author: judith_osdl Date: 2006-05-19 16:12:17 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=277&view=rev Log Message: ----------- Fix for the software type changes. Modified Paths: -------------- trunk/stp-ror/app/apis/test_request_service.rb Modified: trunk/stp-ror/app/apis/test_request_service.rb =================================================================== --- trunk/stp-ror/app/apis/test_request_service.rb 2006-05-18 16:23:33 UTC (rev 276) +++ trunk/stp-ror/app/apis/test_request_service.rb 2006-05-19 23:12:17 UTC (rev 277) @@ -47,11 +47,12 @@ :select => 'id, test_case_id') software_stack = Array.new for software in test_request.softwares + my_software_type=SoftwareType.find(:first, :select => 'id, name', :conditions => ['id = ?', software['software_type_id']] ) ss = SoftwareStack.new( { - :software_name => software['name'], + :software_name => my_software_type['name'], :patch_name => software['patch_name'], :install_priority => - software.test_cases.find(test_request['test_case_id'])['install_priority'] }) + my_software_type.test_cases.find(test_request['test_case_id'])['install_priority'] }) software_stack.push(ss) end software_stack This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-05-18 16:23:40
|
Revision: 276 Author: judith_osdl Date: 2006-05-18 09:23:33 -0700 (Thu, 18 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=276&view=rev Log Message: ----------- This is to define table. Added Paths: ----------- trunk/stp-ror/app/models/software_type.rb Added: trunk/stp-ror/app/models/software_type.rb =================================================================== --- trunk/stp-ror/app/models/software_type.rb (rev 0) +++ trunk/stp-ror/app/models/software_type.rb 2006-05-18 16:23:33 UTC (rev 276) @@ -0,0 +1,7 @@ +# +# Copyright (C) 2006 Mark Wong & Open Source Development Lab, Inc. +# + +class SoftwareType < ActiveRecord::Base + has_and_belongs_to_many :test_cases +end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-05-04 21:29:21
|
Revision: 275 Author: judith_osdl Date: 2006-05-04 14:29:16 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=275&view=rev Log Message: ----------- Changes to views and scripts to match the new softwares_types table and the name->patch_name column name change in softwares. This fixes a problem with requesting tests. Remove unused search tags. Fix ID field in edit form. Modified Paths: -------------- trunk/stp-ror/app/controllers/test_cases_controller.rb trunk/stp-ror/app/controllers/test_requests_controller.rb trunk/stp-ror/app/models/software.rb trunk/stp-ror/app/models/test_case.rb trunk/stp-ror/app/models/test_request.rb trunk/stp-ror/app/views/layouts/application.rhtml trunk/stp-ror/app/views/softwares/_form.rhtml trunk/stp-ror/app/views/test_cases/show.rhtml trunk/stp-ror/app/views/test_requests/_software.rhtml trunk/stp-ror/app/views/test_requests/_test_options.rhtml trunk/stp-ror/app/views/test_requests/edit.rhtml Modified: trunk/stp-ror/app/controllers/test_cases_controller.rb =================================================================== --- trunk/stp-ror/app/controllers/test_cases_controller.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/controllers/test_cases_controller.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -8,7 +8,7 @@ def add_software test_case = TestCase.find(params['id']) software = Software.find(params['software']['id']) - if test_case.softwares.push_with_attributes software, params['softwares_test_cases'] + if test_case.softwares.push_with_attributes software, params['software_types_test_cases'] flash[:notice] = 'Test was successfully updated.' redirect_to :action => 'show', :id => test_case else Modified: trunk/stp-ror/app/controllers/test_requests_controller.rb =================================================================== --- trunk/stp-ror/app/controllers/test_requests_controller.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/controllers/test_requests_controller.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -31,6 +31,7 @@ softwares_test_requests = @params[:softwares_test_requests] unless softwares_test_requests.nil? then + soap = SOAP::WSDLDriverFactory.new(WSDL_URL).createDriver softwares_test_requests.each { |software_id, attr| # @@ -38,8 +39,9 @@ # in order to insert a row into the relation table. But then I # barely know how to use rails... # - software = Software.find(software_id) next if attr[:value].empty? + my_patch = soap.PatchFindByName(attr[:value]) + software = Software.find(my_patch) rc = @test_request.softwares.push_with_attributes(software, { :value => attr[:value] }) } @@ -128,7 +130,7 @@ @distros = Distro.find(:all, :order => 'descriptor') @test_cases = TestCase.find(:all, :order => 'descriptor') @host_types = HostType.find(:all, :order => 'descriptor') - @softwares = Software.find(:all, :order => 'name') + @softwares = SoftwareType.find(:all, :order => 'name') @test_request_states = TestRequestState.find(:all, :order => 'name') end Modified: trunk/stp-ror/app/models/software.rb =================================================================== --- trunk/stp-ror/app/models/software.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/models/software.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -3,5 +3,5 @@ # class Software < ActiveRecord::Base - has_and_belongs_to_many :test_cases + has_many :software_types end Modified: trunk/stp-ror/app/models/test_case.rb =================================================================== --- trunk/stp-ror/app/models/test_case.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/models/test_case.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -5,7 +5,7 @@ class TestCase < ActiveRecord::Base has_and_belongs_to_many :distros, :order => 'descriptor' has_and_belongs_to_many :host_types, :order => 'descriptor' - has_and_belongs_to_many :softwares, :order => 'install_priority, name' + has_and_belongs_to_many :software_types, :order => 'install_priority, name' has_many :parameters, :order => 'descriptor' has_many :metrics Modified: trunk/stp-ror/app/models/test_request.rb =================================================================== --- trunk/stp-ror/app/models/test_request.rb 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/models/test_request.rb 2006-05-04 21:29:16 UTC (rev 275) @@ -24,7 +24,7 @@ has_and_belongs_to_many :parameters, :order => 'descriptor' - has_and_belongs_to_many :softwares, :order => 'name' + has_and_belongs_to_many :softwares, :order => 'softwares.patch_name' has_one :host Modified: trunk/stp-ror/app/views/layouts/application.rhtml =================================================================== --- trunk/stp-ror/app/views/layouts/application.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/layouts/application.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -28,17 +28,9 @@ <li class="sub"><div class="title">Search</div></li> <ul class="sub"> <li class="sub"> - <%= link_to 'Build Sets', {:controller => 'build_sets', - :action => 'search'} %> - </li> - <li class="sub"> <%= link_to 'Test Requests', {:controller => 'test_requests', :action => 'search'} %> </li> - <li class="sub"> - <%= link_to 'Sub Test Requests', {:controller => 'sub_test_requests', - :action => 'search'} %> - </li> </ul> </ul> </ul> Modified: trunk/stp-ror/app/views/softwares/_form.rhtml =================================================================== --- trunk/stp-ror/app/views/softwares/_form.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/softwares/_form.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -8,6 +8,9 @@ <%= datetime_select 'software', 'updated_on' %></p> <p><label for="software_name">Name</label><br/> -<%= text_field 'software', 'name' %></p> +<%= text_field 'software', 'patch_name' %></p> + +<p><label for="software_type_id">Name</label><br/> +<%= text_field 'software', 'software_type_id' %></p> <!--[eoform:software]--> Modified: trunk/stp-ror/app/views/test_cases/show.rhtml =================================================================== --- trunk/stp-ror/app/views/test_cases/show.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/test_cases/show.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -32,7 +32,7 @@ <tr> <td><b>Add software component:</b></td> <td><%= select('software', 'id', @softwares.collect { |software| [ software.name, software.id ] }, { :include_blank => true }) %></td> - <td><%= text_field 'softwares_test_cases', 'install_priority' %></td> + <td><%= text_field 'software_types_test_cases', 'install_priority' %></td> <td><%= submit_tag 'Add' %></td> </tr> </table> Modified: trunk/stp-ror/app/views/test_requests/_software.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/_software.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/test_requests/_software.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -4,7 +4,7 @@ <%= text_field_tag "softwares_test_requests[#{software.id}][value]", software[:value] %> <%= observe_field "softwares_test_requests[#{software.id}][value]", - :frequency => 0.5, :update => "software_name_#{software.id}_div", + :frequency => 1.0, :update => "software_name_#{software.id}_div", :url => { :action => 'verify_patch_name' }, :with => "'patch_name=' + escape(value) + '&software_name=#{software['name']}'" %> </td> Modified: trunk/stp-ror/app/views/test_requests/_test_options.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/_test_options.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/test_requests/_test_options.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -22,11 +22,11 @@ </p> <% end %> -<% if @test_case.softwares.length > 0 then %> +<% if @test_case.software_types.length > 0 then %> <p> <table> <caption>Software Components</caption> - <%= render_collection_of_partials "software", @test_case.softwares %> + <%= render_collection_of_partials "software", @test_case.software_types %> </table> </p> <% end %> Modified: trunk/stp-ror/app/views/test_requests/edit.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/edit.rhtml 2006-05-04 21:26:28 UTC (rev 274) +++ trunk/stp-ror/app/views/test_requests/edit.rhtml 2006-05-04 21:29:16 UTC (rev 275) @@ -4,7 +4,7 @@ <table> <tr> <td align="right" valign="top">ID:</td> - <td><%= @test_request.test_case[:id] %></td> + <td><%= @test_request.id %></td> </tr> <tr> <td align="right" valign="top">Test:</td> @@ -46,7 +46,7 @@ <%= render_collection_of_partials "parameter", @test_request.parameters %> </table> <% end %> -<% if @test_request.test_case.softwares.length > 0 then %> +<% if @test_request.test_case.software_types.length > 0 then %> <hr /> <table> <caption>Software Components</caption> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-05-04 21:26:32
|
Revision: 274 Author: judith_osdl Date: 2006-05-04 14:26:28 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=274&view=rev Log Message: ----------- Add a software types table. Make column names match in softwares and softwares_test_requests. Modified Paths: -------------- trunk/stp-ror/db/development_structure.sql Modified: trunk/stp-ror/db/development_structure.sql =================================================================== --- trunk/stp-ror/db/development_structure.sql 2006-04-13 17:20:57 UTC (rev 273) +++ trunk/stp-ror/db/development_structure.sql 2006-05-04 21:26:28 UTC (rev 274) @@ -332,20 +332,25 @@ id bigserial NOT NULL, created_on timestamp without time zone DEFAULT now(), updated_on timestamp without time zone DEFAULT now(), + patch_name text NOT NULL, + software_type_id integer NOT NULL +); + +CREATE TABLE software_types ( + id serial NOT NULL, name text NOT NULL ); - SET default_with_oids = true; -- --- Name: softwares_test_cases; Type: TABLE; Schema: public; Owner: stp_admin; Tablespace: +-- Name: software_types_test_cases; Type: TABLE; Schema: public; Owner: stp_admin; Tablespace: -- -CREATE TABLE softwares_test_cases ( +CREATE TABLE software_types_test_cases ( test_case_id integer NOT NULL, install_priority integer NOT NULL, - software_id integer NOT NULL + software_type_id integer NOT NULL ); @@ -651,11 +656,11 @@ -- --- Name: softwares_test_cases_pkey; Type: CONSTRAINT; Schema: public; Owner: stp_admin; Tablespace: +-- Name: software_types_test_cases_pkey; Type: CONSTRAINT; Schema: public; Owner: stp_admin; Tablespace: -- -ALTER TABLE ONLY softwares_test_cases - ADD CONSTRAINT softwares_test_cases_pkey PRIMARY KEY (test_case_id, software_id); +ALTER TABLE ONLY software_types_test_cases + ADD CONSTRAINT software_types_test_cases_pkey PRIMARY KEY (test_case_id, software_id); -- @@ -929,19 +934,19 @@ -- --- Name: softwares_test_cases_software_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: stp_admin +-- Name: software_types_test_cases_software_type_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: stp_admin -- -ALTER TABLE ONLY softwares_test_cases - ADD CONSTRAINT softwares_test_cases_software_id_fkey FOREIGN KEY (software_id) REFERENCES softwares(id) ON UPDATE RESTRICT ON DELETE RESTRICT; +ALTER TABLE ONLY software_types_test_cases + ADD CONSTRAINT software_types_test_cases_software_type_id_fkey FOREIGN KEY (software_type_id) REFERENCES software_types(id) ON UPDATE RESTRICT ON DELETE RESTRICT; -- --- Name: softwares_test_cases_test_case_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: stp_admin +-- Name: software_types_test_cases_test_case_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: stp_admin -- -ALTER TABLE ONLY softwares_test_cases - ADD CONSTRAINT softwares_test_cases_test_case_id_fkey FOREIGN KEY (test_case_id) REFERENCES test_cases(id) ON UPDATE RESTRICT ON DELETE RESTRICT; +ALTER TABLE ONLY software_types_test_cases + ADD CONSTRAINT software_types_test_cases_test_case_id_fkey FOREIGN KEY (test_case_id) REFERENCES test_cases(id) ON UPDATE RESTRICT ON DELETE RESTRICT; -- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-04-13 17:21:15
|
Revision: 273 Author: judith_osdl Date: 2006-04-13 10:20:57 -0700 (Thu, 13 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=273&view=rev Log Message: ----------- Get rid of fkey off column that was deleted previously. Add hosttype for 'unassigned'. Modified Paths: -------------- trunk/stp-ror/db/development_structure.sql Modified: trunk/stp-ror/db/development_structure.sql =================================================================== --- trunk/stp-ror/db/development_structure.sql 2006-04-12 18:57:24 UTC (rev 272) +++ trunk/stp-ror/db/development_structure.sql 2006-04-13 17:20:57 UTC (rev 273) @@ -889,14 +889,6 @@ -- --- Name: package_sets_distro_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: stp_admin --- - -ALTER TABLE ONLY package_sets - ADD CONSTRAINT package_sets_distro_id_fkey FOREIGN KEY (distro_id) REFERENCES distros(id) ON UPDATE RESTRICT ON DELETE RESTRICT; - - --- -- Name: package_sets_package_set_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: stp_admin -- @@ -1040,3 +1032,5 @@ INSERT INTO test_request_states VALUES (10, NOW(), NOW(), 'Uploading Results'); INSERT INTO test_request_states VALUES (11, NOW(), NOW(), 'Installing Operating System'); +INSERT INTO host_types VALUES('0','No host type assigned',NULL,NOW()); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-04-12 18:57:30
|
Revision: 272 Author: judith_osdl Date: 2006-04-12 11:57:24 -0700 (Wed, 12 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=272&view=rev Log Message: ----------- Add the states to the test_request_states table. Modified Paths: -------------- trunk/stp-ror/db/development_structure.sql Modified: trunk/stp-ror/db/development_structure.sql =================================================================== --- trunk/stp-ror/db/development_structure.sql 2006-04-06 22:17:52 UTC (rev 271) +++ trunk/stp-ror/db/development_structure.sql 2006-04-12 18:57:24 UTC (rev 272) @@ -1028,3 +1028,15 @@ -- PostgreSQL database dump complete -- +INSERT INTO test_request_states VALUES (1, NOW(), NOW(), 'Queued'); +INSERT INTO test_request_states VALUES (2, NOW(), NOW(), 'Running'); +INSERT INTO test_request_states VALUES (3, NOW(), NOW(), 'Completed'); +INSERT INTO test_request_states VALUES (4, NOW(), NOW(), 'Failed'); +INSERT INTO test_request_states VALUES (5, NOW(), NOW(), 'Canceled'); +INSERT INTO test_request_states VALUES (6, NOW(), NOW(), 'Recovering'); +INSERT INTO test_request_states VALUES (7, NOW(), NOW(), 'Inserting'); +INSERT INTO test_request_states VALUES (8, NOW(), NOW(), 'Adding Additional Software'); +INSERT INTO test_request_states VALUES (9, NOW(), NOW(), 'Rebooting After Kernel Install'); +INSERT INTO test_request_states VALUES (10, NOW(), NOW(), 'Uploading Results'); +INSERT INTO test_request_states VALUES (11, NOW(), NOW(), 'Installing Operating System'); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-04-06 22:18:06
|
Revision: 271 Author: judith_osdl Date: 2006-04-06 15:17:52 -0700 (Thu, 06 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=271&view=rev Log Message: ----------- Get the kernel name from plm in the plm module. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Kernel/Plm.pm Modified: trunk/Test-Sut/lib/Test/Sut/Kernel/Plm.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Kernel/Plm.pm 2006-04-06 17:23:20 UTC (rev 270) +++ trunk/Test-Sut/lib/Test/Sut/Kernel/Plm.pm 2006-04-06 22:17:52 UTC (rev 271) @@ -109,6 +109,9 @@ my $plm_patch = $self->{ 'plm_patch' }; my $patch_tag = $self->{ 'patch_tag' }; + $self->{ 'kernel_name' } = `plm_information.pl GetName $patch_tag`; + chomp $self->{ 'kernel_name' }; + chdir $ENV{ 'EXEC_HOME' }; system "$plm_patch linux $patch_tag > $ENV{ 'SYSTEM_LOGS' }/plm_build_tree.txt 2>&1 "; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-04-06 17:23:26
|
Revision: 270 Author: judith_osdl Date: 2006-04-06 10:23:20 -0700 (Thu, 06 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=270&view=rev Log Message: ----------- Example xml input files. Added Paths: ----------- trunk/Test-Sut/etc/build_set.xml trunk/Test-Sut/etc/test_request.xml trunk/Test-Sut/etc/tests.xml Added: trunk/Test-Sut/etc/build_set.xml =================================================================== --- trunk/Test-Sut/etc/build_set.xml (rev 0) +++ trunk/Test-Sut/etc/build_set.xml 2006-04-06 17:23:20 UTC (rev 270) @@ -0,0 +1,182 @@ +<build_set> + <package_set id=21 descriptor="Core20051212" install_priority="0"> + <package descriptor="sysklogd" directory="app-admin" version="1.4.1-r11" install_priority="0" build_only="0" /> + <package descriptor="perl-cleaner" directory="app-admin" version="1.01" install_priority="0" build_only="0" /> + <package descriptor="ncompress" directory="app-arch" version="4.2.4-r1" install_priority="0" build_only="0" /> + <package descriptor="tar" directory="app-arch" version="1.15.1" install_priority="0" build_only="0" /> + <package descriptor="rpm" directory="app-arch" version="4.2" install_priority="0" build_only="0" /> + <package descriptor="gzip" directory="app-arch" version="1.3.5-r8" install_priority="0" build_only="0" /> + <package descriptor="bzip2" directory="app-arch" version="1.0.3-r5" install_priority="0" build_only="0" /> + <package descriptor="rpm2targz" directory="app-arch" version="9.0-r3" install_priority="0" build_only="0" /> + <package descriptor="cpio" directory="app-arch" version="2.6-r5" install_priority="0" build_only="0" /> + <package descriptor="stp" directory="app-benchmarks" version="3.1.1_pre3" install_priority="0" build_only="0" /> + <package descriptor="brt" directory="app-benchmarks" version="0.1.5-r4" install_priority="0" build_only="0" /> + <package descriptor="hashalot" directory="app-crypt" version="0.3" install_priority="0" build_only="0" /> + <package descriptor="gnupg" directory="app-crypt" version="1.4.2-r3" install_priority="0" build_only="0" /> + <package descriptor="nano" directory="app-editors" version="1.3.7" install_priority="0" build_only="0" /> + <package descriptor="vim" directory="app-editors" version="6.4" install_priority="0" build_only="0" /> + <package descriptor="vim-core" directory="app-editors" version="6.4" install_priority="0" build_only="0" /> + <package descriptor="gentoolkit" directory="app-portage" version="0.2.0-r3" install_priority="0" build_only="0" /> + <package descriptor="bash" directory="app-shells" version="3.0-r12" install_priority="0" build_only="0" /> + <package descriptor="gentoo-syntax" directory="app-vim" version="20050618" install_priority="0" build_only="0" /> + <package descriptor="python" directory="dev-lang" version="2.4.2" install_priority="0" build_only="0" /> + <package descriptor="python" directory="dev-lang" version="2.3.5-r2" install_priority="0" build_only="0" /> + <package descriptor="perl" directory="dev-lang" version="5.8.6-r8" install_priority="0" build_only="0" /> + <package descriptor="glib" directory="dev-libs" version="2.6.5" install_priority="0" build_only="0" /> + <package descriptor="popt" directory="dev-libs" version="1.7-r1" install_priority="0" build_only="0" /> + <package descriptor="expat" directory="dev-libs" version="1.95.8" install_priority="0" build_only="0" /> + <package descriptor="elfutils" directory="dev-libs" version="0.108" install_priority="0" build_only="0" /> + <package descriptor="libxml2" directory="dev-libs" version="2.6.22" install_priority="0" build_only="0" /> + <package descriptor="atk" directory="dev-libs" version="1.10.1" install_priority="0" build_only="0" /> + <package descriptor="openssl" directory="dev-libs" version="0.9.7e-r2" install_priority="0" build_only="0" /> + <package descriptor="XML-Parser" directory="dev-perl" version="2.34" install_priority="0" build_only="0" /> + <package descriptor="Class-MethodMaker" directory="dev-perl" version="1.11" install_priority="0" build_only="0" /> + <package descriptor="Compress-Zlib" directory="dev-perl" version="1.33" install_priority="0" build_only="0" /> + <package descriptor="TermReadKey" directory="dev-perl" version="2.21" install_priority="0" build_only="0" /> + <package descriptor="XML-Writer" directory="dev-perl" version="0.510" install_priority="0" build_only="0" /> + <package descriptor="yaml" directory="dev-perl" version="0.36" install_priority="0" build_only="0" /> + <package descriptor="Archive-Tar" directory="dev-perl" version="1.23-r1" install_priority="0" build_only="0" /> + <package descriptor="URI" directory="dev-perl" version="1.35" install_priority="0" build_only="0" /> + <package descriptor="IO-Zlib" directory="dev-perl" version="1.01" install_priority="0" build_only="0" /> + <package descriptor="IO-String" directory="dev-perl" version="1.05" install_priority="0" build_only="0" /> + <package descriptor="GnuPG-Interface" directory="dev-perl" version="0.34" install_priority="0" build_only="0" /> + <package descriptor="module-build" directory="dev-perl" version="0.25" install_priority="0" build_only="0" /> + <package descriptor="Config-Simple" directory="dev-perl" version="4.57" install_priority="0" build_only="0" /> + <package descriptor="HTML-Tagset" directory="dev-perl" version="3.03-r2" install_priority="0" build_only="0" /> + <package descriptor="HTML-Parser" directory="dev-perl" version="3.36-r1" install_priority="0" build_only="0" /> + <package descriptor="libwww-perl" directory="dev-perl" version="5.800" install_priority="0" build_only="0" /> + <package descriptor="libnet" directory="dev-perl" version="1.19" install_priority="0" build_only="0" /> + <package descriptor="Crypt-SSLeay" directory="dev-perl" version="0.49" install_priority="0" build_only="0" /> + <package descriptor="Net-SSLeay" directory="dev-perl" version="1.25" install_priority="0" build_only="0" /> + <package descriptor="IO-Socket-SSL" directory="dev-perl" version="0.96" install_priority="0" build_only="0" /> + <package descriptor="IO-stringy" directory="dev-perl" version="2.109" install_priority="0" build_only="0" /> + <package descriptor="MailTools" directory="dev-perl" version="1.65" install_priority="0" build_only="0" /> + <package descriptor="MIME-tools" directory="dev-perl" version="5.415" install_priority="0" build_only="0" /> + <package descriptor="MIME-Lite" directory="dev-perl" version="3.01" install_priority="0" build_only="0" /> + <package descriptor="SOAP-Lite" directory="dev-perl" version="0.60a-r1" install_priority="0" build_only="0" /> + <package descriptor="XML-NamespaceSupport" directory="dev-perl" version="1.08" install_priority="0" build_only="0" /> + <package descriptor="XML-SAX" directory="dev-perl" version="0.12" install_priority="0" build_only="0" /> + <package descriptor="Locale-gettext" directory="dev-perl" version="1.03" install_priority="0" build_only="0" /> + <package descriptor="XML-Simple" directory="dev-perl" version="2.12" install_priority="0" build_only="0" /> + <package descriptor="python-fchksum" directory="dev-python" version="1.7.1" install_priority="0" build_only="0" /> + <package descriptor="ctags" directory="dev-util" version="5.5.4-r1" install_priority="0" build_only="0" /> + <package descriptor="pkgconfig" directory="dev-util" version="0.17.2-r1" install_priority="0" build_only="0" /> + <package descriptor="intltool" directory="dev-util" version="0.34.1" install_priority="0" build_only="0" /> + <package descriptor="procmail" directory="mail-filter" version="3.22-r6" install_priority="0" build_only="0" /> + <package descriptor="sendmail" directory="mail-mta" version="8.13.4" install_priority="0" build_only="0" /> + <package descriptor="xloadimage" directory="media-gfx" version="4.1-r4" install_priority="0" build_only="0" /> + <package descriptor="freetype" directory="media-libs" version="2.1.9-r1" install_priority="0" build_only="0" /> + <package descriptor="fontconfig" directory="media-libs" version="2.2.3" install_priority="0" build_only="0" /> + <package descriptor="libpng" directory="media-libs" version="1.2.8" install_priority="0" build_only="0" /> + <package descriptor="jpeg" directory="media-libs" version="6b-r5" install_priority="0" build_only="0" /> + <package descriptor="mailbase" directory="net-mail" version="0.00-r9" install_priority="0" build_only="0" /> + <package descriptor="dhcpcd" directory="net-misc" version="2.0.0" install_priority="0" build_only="0" /> + <package descriptor="rsync" directory="net-misc" version="2.6.0-r6" install_priority="0" build_only="0" /> + <package descriptor="iputils" directory="net-misc" version="021109-r3" install_priority="0" build_only="0" /> + <package descriptor="wget" directory="net-misc" version="1.10.2" install_priority="0" build_only="0" /> + <package descriptor="openssh" directory="net-misc" version="4.2_p1" install_priority="0" build_only="0" /> + <package descriptor="Test-Simple" directory="perl-core" version="0.54" install_priority="0" build_only="0" /> + <package descriptor="Test-Harness" directory="perl-core" version="2.42" install_priority="0" build_only="0" /> + <package descriptor="File-Spec" directory="perl-core" version="0.87" install_priority="0" build_only="0" /> + <package descriptor="MIME-Base64" directory="perl-core" version="3.05" install_priority="0" build_only="0" /> + <package descriptor="digest-base" directory="perl-core" version="1.05" install_priority="0" build_only="0" /> + <package descriptor="Digest-MD5" directory="perl-core" version="2.33" install_priority="0" build_only="0" /> + <package descriptor="File-Temp" directory="perl-core" version="0.14" install_priority="0" build_only="0" /> + <package descriptor="Storable" directory="perl-core" version="2.13" install_priority="0" build_only="0" /> + <package descriptor="ExtUtils-MakeMaker" directory="perl-core" version="6.21-r1" install_priority="0" build_only="0" /> + <package descriptor="groff" directory="sys-apps" version="1.19.1-r2" install_priority="0" build_only="0" /> + <package descriptor="findutils" directory="sys-apps" version="4.1.20-r1" install_priority="0" build_only="0" /> + <package descriptor="hdparm" directory="sys-apps" version="5.9" install_priority="0" build_only="0" /> + <package descriptor="texinfo" directory="sys-apps" version="4.8-r2" install_priority="0" build_only="0" /> + <package descriptor="debianutils" directory="sys-apps" version="2.14.1-r1" install_priority="0" build_only="0" /> + <package descriptor="sed" directory="sys-apps" version="4.1.4" install_priority="0" build_only="0" /> + <package descriptor="man" directory="sys-apps" version="1.6-r1" install_priority="0" build_only="0" /> + <package descriptor="busybox" directory="sys-apps" version="1.00-r4" install_priority="0" build_only="0" /> + <package descriptor="coreutils" directory="sys-apps" version="5.2.1-r6" install_priority="0" build_only="0" /> + <package descriptor="help2man" directory="sys-apps" version="1.33.1" install_priority="0" build_only="0" /> + <package descriptor="grep" directory="sys-apps" version="2.5.1-r8" install_priority="0" build_only="0" /> + <package descriptor="less" directory="sys-apps" version="385_p4-r2" install_priority="0" build_only="0" /> + <package descriptor="kbd" directory="sys-apps" version="1.12-r5" install_priority="0" build_only="0" /> + <package descriptor="miscfiles" directory="sys-apps" version="1.4.2" install_priority="0" build_only="0" /> + <package descriptor="ed" directory="sys-apps" version="0.2-r6" install_priority="0" build_only="0" /> + <package descriptor="pam-login" directory="sys-apps" version="3.17" install_priority="0" build_only="0" /> + <package descriptor="file" directory="sys-apps" version="4.13" install_priority="0" build_only="0" /> + <package descriptor="net-tools" directory="sys-apps" version="1.60-r11" install_priority="0" build_only="0" /> + <package descriptor="which" directory="sys-apps" version="2.16" install_priority="0" build_only="0" /> + <package descriptor="sysvinit" directory="sys-apps" version="2.86" install_priority="0" build_only="0" /> + <package descriptor="tcp-wrappers" directory="sys-apps" version="7.6-r8" install_priority="0" build_only="0" /> + <package descriptor="module-init-tools" directory="sys-apps" version="3.0-r2" install_priority="0" build_only="0" /> + <package descriptor="diffutils" directory="sys-apps" version="2.8.7-r1" install_priority="0" build_only="0" /> + <package descriptor="man-pages" directory="sys-apps" version="2.14" install_priority="0" build_only="0" /> + <package descriptor="sandbox" directory="sys-apps" version="1.2.12" install_priority="0" build_only="0" /> + <package descriptor="hotplug-base" directory="sys-apps" version="20040401" install_priority="0" build_only="0" /> + <package descriptor="utempter" directory="sys-apps" version="0.5.5.6" install_priority="0" build_only="0" /> + <package descriptor="gawk" directory="sys-apps" version="3.1.4-r4" install_priority="0" build_only="0" /> + <package descriptor="baselayout" directory="sys-apps" version="1.11.13-r1" install_priority="0" build_only="0" /> + <package descriptor="portage" directory="sys-apps" version="2.0.51.22-r3" install_priority="0" build_only="0" /> + <package descriptor="pciutils" directory="sys-apps" version="2.2.0-r1" install_priority="0" build_only="0" /> + <package descriptor="lshw" directory="sys-apps" version="02.05.01b" install_priority="0" build_only="0" /> + <package descriptor="shadow" directory="sys-apps" version="4.0.7-r4" install_priority="0" build_only="0" /> + <package descriptor="util-linux" directory="sys-apps" version="2.12r-r1" install_priority="0" build_only="0" /> + <package descriptor="grub" directory="sys-boot" version="0.96-r2" install_priority="0" build_only="0" /> + <package descriptor="gcc" directory="sys-devel" version="3.3.6" install_priority="0" build_only="0" /> + <package descriptor="patch" directory="sys-devel" version="2.5.9" install_priority="0" build_only="0" /> + <package descriptor="gcc" directory="sys-devel" version="3.4.4-r1" install_priority="0" build_only="0" /> + <package descriptor="gettext" directory="sys-devel" version="0.14.4" install_priority="0" build_only="0" /> + <package descriptor="bison" directory="sys-devel" version="1.875d" install_priority="0" build_only="0" /> + <package descriptor="autoconf" directory="sys-devel" version="2.13" install_priority="0" build_only="0" /> + <package descriptor="automake" directory="sys-devel" version="1.5" install_priority="0" build_only="0" /> + <package descriptor="automake" directory="sys-devel" version="1.9.6-r1" install_priority="0" build_only="0" /> + <package descriptor="autoconf" directory="sys-devel" version="2.59-r6" install_priority="0" build_only="0" /> + <package descriptor="automake" directory="sys-devel" version="1.8.5-r3" install_priority="0" build_only="0" /> + <package descriptor="gnuconfig" directory="sys-devel" version="20051113" install_priority="0" build_only="0" /> + <package descriptor="bc" directory="sys-devel" version="1.06-r6" install_priority="0" build_only="0" /> + <package descriptor="flex" directory="sys-devel" version="2.5.4a-r6" install_priority="0" build_only="0" /> + <package descriptor="m4" directory="sys-devel" version="1.4.3" install_priority="0" build_only="0" /> + <package descriptor="automake-wrapper" directory="sys-devel" version="1-r1" install_priority="0" build_only="0" /> + <package descriptor="libperl" directory="sys-devel" version="5.8.6-r1" install_priority="0" build_only="0" /> + <package descriptor="automake" directory="sys-devel" version="1.6.3" install_priority="0" build_only="0" /> + <package descriptor="make" directory="sys-devel" version="3.80-r2" install_priority="0" build_only="0" /> + <package descriptor="automake" directory="sys-devel" version="1.7.9-r1" install_priority="0" build_only="0" /> + <package descriptor="automake" directory="sys-devel" version="1.4_p6" install_priority="0" build_only="0" /> + <package descriptor="autoconf-wrapper" directory="sys-devel" version="3-r1" install_priority="0" build_only="0" /> + <package descriptor="binutils" directory="sys-devel" version="2.16.1" install_priority="0" build_only="0" /> + <package descriptor="gcc-config" directory="sys-devel" version="1.3.12-r4" install_priority="0" build_only="0" /> + <package descriptor="libtool" directory="sys-devel" version="1.5.20" install_priority="0" build_only="0" /> + <package descriptor="binutils-config" directory="sys-devel" version="1.8-r6" install_priority="0" build_only="0" /> + <package descriptor="reiserfsprogs" directory="sys-fs" version="3.6.19" install_priority="0" build_only="0" /> + <package descriptor="e2fsprogs" directory="sys-fs" version="1.38" install_priority="0" build_only="0" /> + <package descriptor="udev" directory="sys-fs" version="070-r1" install_priority="0" build_only="0" /> + <package descriptor="linux-headers" directory="sys-kernel" version="2.6.11-r2" install_priority="0" build_only="0" /> + <package descriptor="vanilla-sources" directory="sys-kernel" version="2.6.14.2" install_priority="0" build_only="0" /> + <package descriptor="db" directory="sys-libs" version="1.85-r2" install_priority="0" build_only="0" /> + <package descriptor="cracklib" directory="sys-libs" version="2.8.3-r1" install_priority="0" build_only="0" /> + <package descriptor="readline" directory="sys-libs" version="5.0-r2" install_priority="0" build_only="0" /> + <package descriptor="ss" directory="sys-libs" version="1.38" install_priority="0" build_only="0" /> + <package descriptor="gpm" directory="sys-libs" version="1.20.1-r4" install_priority="0" build_only="0" /> + <package descriptor="com_err" directory="sys-libs" version="1.38" install_priority="0" build_only="0" /> + <package descriptor="db" directory="sys-libs" version="3.2.9-r10" install_priority="0" build_only="0" /> + <package descriptor="pwdb" directory="sys-libs" version="0.62" install_priority="0" build_only="0" /> + <package descriptor="zlib" directory="sys-libs" version="1.2.3" install_priority="0" build_only="0" /> + <package descriptor="ncurses" directory="sys-libs" version="5.4-r6" install_priority="0" build_only="0" /> + <package descriptor="pam" directory="sys-libs" version="0.78-r3" install_priority="0" build_only="0" /> + <package descriptor="glibc" directory="sys-libs" version="2.3.5-r2" install_priority="0" build_only="0" /> + <package descriptor="db" directory="sys-libs" version="4.2.52_p2-r1" install_priority="0" build_only="0" /> + <package descriptor="gdbm" directory="sys-libs" version="1.8.3-r2" install_priority="0" build_only="0" /> + <package descriptor="procps" directory="sys-process" version="3.2.5-r1" install_priority="0" build_only="0" /> + <package descriptor="psmisc" directory="sys-process" version="21.6" install_priority="0" build_only="0" /> + <package descriptor="cronbase" directory="sys-process" version="0.3.2" install_priority="0" build_only="0" /> + <package descriptor="opengl-update" directory="x11-base" version="2.2.1" install_priority="0" build_only="0" /> + <package descriptor="xorg-x11" directory="x11-base" version="6.8.2-r6" install_priority="0" build_only="0" /> + <package descriptor="pango" directory="x11-libs" version="1.8.1-r1" install_priority="0" build_only="0" /> + <package descriptor="gtk+" directory="x11-libs" version="2.6.10-r1" install_priority="0" build_only="0" /> + <package descriptor="shared-mime-info" directory="x11-misc" version="0.16" install_priority="0" build_only="0" /> + <package descriptor="ttmkfdir" directory="x11-misc" version="3.0.9-r3" install_priority="0" build_only="0" /> + <package descriptor="xterm" directory="x11-terms" version="204" install_priority="0" build_only="0" /> + <package descriptor="vixie-cron" directory="sys-process" version="4.1-r8" install_priority="0" build_only="0" /> + </package_set> + <package_set id=22 descriptor="X11R6-3" install_priority="1"> + <package descriptor="tiff" directory="media-libs" version="3.7.3" install_priority="0" build_only="0" /> + <package descriptor="glut" directory="media-libs" version="3.7.1" install_priority="0" build_only="0" /> + </package_set> +</build_set> Added: trunk/Test-Sut/etc/test_request.xml =================================================================== --- trunk/Test-Sut/etc/test_request.xml (rev 0) +++ trunk/Test-Sut/etc/test_request.xml 2006-04-06 17:23:20 UTC (rev 270) @@ -0,0 +1,11 @@ +<test_request id="2487"> + <linux_append></linux_append> + <test_request_state_name>Queued</test_request_state_name> + <sysctl></sysctl> + <environment></environment> + <test_case_descriptor>LTP</test_case_descriptor> + <test_version>1.0</test_version> + <software patch_name="4927" software_name="linux" software_type="linux" install_priority="1" /> + <test_params></test_params> + <source_location>http://www.testing.osdl.org/tests/bootme.tar.gz</source_location> +</test_request> Added: trunk/Test-Sut/etc/tests.xml =================================================================== --- trunk/Test-Sut/etc/tests.xml (rev 0) +++ trunk/Test-Sut/etc/tests.xml 2006-04-06 17:23:20 UTC (rev 270) @@ -0,0 +1,3 @@ +<test_request_set test_request_uid="2488"> + <test_request test_request_id="2489" test_case_descriptor="LTP" test_version="0.1" source_location="http://www.testing.osdl.org/tests/LTP.tar.gz" environment="" test_params="" continue_on_fail="0" run_order="" /> +</test_request_set> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-04-04 20:29:26
|
Revision: 269 Author: judith_osdl Date: 2006-04-04 13:29:16 -0700 (Tue, 04 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=269&view=rev Log Message: ----------- Add build_set_id to the test_request_detail object. Modified Paths: -------------- trunk/stp-ror/app/apis/test_request_detail.rb trunk/stp-ror/app/apis/test_request_service.rb Modified: trunk/stp-ror/app/apis/test_request_detail.rb =================================================================== --- trunk/stp-ror/app/apis/test_request_detail.rb 2006-04-03 21:27:38 UTC (rev 268) +++ trunk/stp-ror/app/apis/test_request_detail.rb 2006-04-04 20:29:16 UTC (rev 269) @@ -13,4 +13,5 @@ member :source_location, :string member :continue_on_fail, :boolean member :run_order, :int + member :build_set_id, :int end Modified: trunk/stp-ror/app/apis/test_request_service.rb =================================================================== --- trunk/stp-ror/app/apis/test_request_service.rb 2006-04-03 21:27:38 UTC (rev 268) +++ trunk/stp-ror/app/apis/test_request_service.rb 2006-04-04 20:29:16 UTC (rev 269) @@ -25,7 +25,8 @@ 'test_version' => host.test_request.test_case['version'], 'source_location' => host.test_request.test_case['source_location'], 'continue_on_fail' => host.test_request['continue_on_fail'], - 'run_order' => host.test_request['run_order'] }) + 'run_order' => host.test_request['run_order'], + 'build_set_id' => host.test_request['build_set_id'] }) end def get_test_request_parameters(test_request_id) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <fi...@us...> - 2006-04-03 21:28:10
|
Revision: 268 Author: fimath Date: 2006-04-03 14:27:38 -0700 (Mon, 03 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=268&view=rev Log Message: ----------- Make more 'test' to 'test_case' corrections. Making test requests appears to be fixed now. Modified Paths: -------------- trunk/stp-ror/app/controllers/host_types_controller.rb trunk/stp-ror/app/controllers/test_cases_controller.rb trunk/stp-ror/app/controllers/test_requests_controller.rb trunk/stp-ror/app/views/host_types/show.rhtml trunk/stp-ror/app/views/hosts/show.rhtml trunk/stp-ror/app/views/test_cases/_form.rhtml trunk/stp-ror/app/views/test_cases/edit.rhtml trunk/stp-ror/app/views/test_cases/list.rhtml trunk/stp-ror/app/views/test_requests/_list_stripes.rhtml trunk/stp-ror/app/views/test_requests/_new.rhtml trunk/stp-ror/app/views/test_requests/_test_options.rhtml trunk/stp-ror/app/views/test_requests/edit.rhtml trunk/stp-ror/app/views/test_requests/search.rhtml trunk/stp-ror/app/views/test_requests/search_result.rhtml Modified: trunk/stp-ror/app/controllers/host_types_controller.rb =================================================================== --- trunk/stp-ror/app/controllers/host_types_controller.rb 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/controllers/host_types_controller.rb 2006-04-03 21:27:38 UTC (rev 268) @@ -27,10 +27,10 @@ end end - def add_test + def add_test_case host_type = HostType.find(params['id']) - test = Test.find(params['test']['id']) - if host_type.tests << test + test_case = TestCase.find(params['test_case']['id']) + if host_type.test_cases << test_case flash[:notice] = 'HostType was successfully updated.' redirect_to :action => 'show', :id => host_type else @@ -56,10 +56,10 @@ redirect_to :action => 'show', :id => host_type end - def delete_test + def delete_test_case host_type = HostType.find(params['id']) - test = Test.find(params['test_id']) - if host_type.tests.delete test + test_case = Test.find(params['test_case_id']) + if host_type.test_cases.delete test_case flash[:notice] = 'HostType was successfully updated.' end redirect_to :action => 'show', :id => host_type @@ -79,7 +79,7 @@ def show @host_type = HostType.find(params[:id]) @hosts = Host.find(:all, :order => 'descriptor') - @tests = Test.find(:all, :order => 'descriptor') + @test_cases = Test.find(:all, :order => 'descriptor') @distros = Distro.find(:all, :order => 'descriptor') end Modified: trunk/stp-ror/app/controllers/test_cases_controller.rb =================================================================== --- trunk/stp-ror/app/controllers/test_cases_controller.rb 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/controllers/test_cases_controller.rb 2006-04-03 21:27:38 UTC (rev 268) @@ -6,23 +6,23 @@ before_filter :authenticate_admin def add_software - test = TestCase.find(params['id']) + test_case = TestCase.find(params['id']) software = Software.find(params['software']['id']) - if test.softwares.push_with_attributes software, params['softwares_test_cases'] + if test_case.softwares.push_with_attributes software, params['softwares_test_cases'] flash[:notice] = 'Test was successfully updated.' - redirect_to :action => 'show', :id => test + redirect_to :action => 'show', :id => test_case else render :action => 'edit' end end def remove_software - test = TestCase.find(params['id']) + test_case = TestCase.find(params['id']) software = Software.find(params['software_id']) - if test.softwares.delete software + if test_case.softwares.delete software flash[:notice] = 'Test was successfully updated.' end - redirect_to :action => 'show', :id => test + redirect_to :action => 'show', :id => test_case end def index Modified: trunk/stp-ror/app/controllers/test_requests_controller.rb =================================================================== --- trunk/stp-ror/app/controllers/test_requests_controller.rb 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/controllers/test_requests_controller.rb 2006-04-03 21:27:38 UTC (rev 268) @@ -126,7 +126,7 @@ def search @distros = Distro.find(:all, :order => 'descriptor') - @tests = TestCase.find(:all, :order => 'descriptor') + @test_cases = TestCase.find(:all, :order => 'descriptor') @host_types = HostType.find(:all, :order => 'descriptor') @softwares = Software.find(:all, :order => 'name') @test_request_states = TestRequestState.find(:all, :order => 'name') @@ -251,7 +251,7 @@ if id.empty? then render_text '' else - @test = TestCase.find(request.raw_post || request.query_string) + @test_case = TestCase.find(request.raw_post || request.query_string) render :partial => 'test_options' end end Modified: trunk/stp-ror/app/views/host_types/show.rhtml =================================================================== --- trunk/stp-ror/app/views/host_types/show.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/host_types/show.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -7,19 +7,19 @@ <p> <table> <caption>Tests in this group:</caption> - <% for test in @host_type.test_cases %> + <% for test_case in @host_type.test_cases %> <tr> - <td><%= test['descriptor'] %></td> - <td><%= link_to 'Remove', { :action => 'delete_test', :id => @host_type['id'], :test_case_id => test['id'] }, :confirm => "Are you sure you want to remove #{test['descriptor']} from #{@host_type['descriptor']}?" %></td> + <td><%= test_case['descriptor'] %></td> + <td><%= link_to 'Remove', { :action => 'delete_test_case', :id => @host_type['id'], :test_case_id => test_case['id'] }, :confirm => "Are you sure you want to remove #{test_case['descriptor']} from #{@host_type['descriptor']}?" %></td> </tr> <% end %> </table> </p> -<%= start_form_tag :action => 'add_test', :id => @host_type %> +<%= start_form_tag :action => 'add_test_case', :id => @host_type %> <p> - <b>Add test:</b> - <%= select('test_case', 'id', @tests.collect { |test| [ test.descriptor, test.id ] }, { :include_blank => true }) %> <%= submit_tag 'Add' %> + <b>Add test case:</b> + <%= select('test_case', 'id', @test_cases.collect { |test_case| [ test_case.descriptor, test_case.id ] }, { :include_blank => true }) %> <%= submit_tag 'Add' %> </p> <%= end_form_tag %> @@ -34,7 +34,7 @@ <tr> <td><%= distro['descriptor'] %></td> <td><%= distro['install_command'] %></td> - <td><%= link_to 'Remove', { :action => 'delete_distro', :id => @host_type['id'], :distro_id => distro['id'] }, :confirm => "Are you sure you want to remove #{test['descriptor']} from #{@host_type['descriptor']}?" %></td> + <td><%= link_to 'Remove', { :action => 'delete_distro', :id => @host_type['id'], :distro_id => distro['id'] }, :confirm => "Are you sure you want to remove #{test_case['descriptor']} from #{@host_type['descriptor']}?" %></td> </tr> <% end %> </table> Modified: trunk/stp-ror/app/views/hosts/show.rhtml =================================================================== --- trunk/stp-ror/app/views/hosts/show.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/hosts/show.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -10,7 +10,7 @@ <table> <tr> <td>Test:</td> - <td><%= @host.test_request.test['descriptor'] if @host.test_request %> (<%= @host['test_request_id'] if @host.test_request %>)</td> + <td><%= @host.test_request.test_case['descriptor'] if @host.test_request %> (<%= @host['test_request_id'] if @host.test_request %>)</td> </tr> <tr> <td>Status:</td> Modified: trunk/stp-ror/app/views/test_cases/_form.rhtml =================================================================== --- trunk/stp-ror/app/views/test_cases/_form.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_cases/_form.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -1,6 +1,6 @@ <%= error_messages_for 'test_case' %> -<!--[form:test]--> +<!--[form:test_case]--> <p><label for="test_case_descriptor">Descriptor</label><br/> <%= text_field 'test_case', 'descriptor' %></p> @@ -21,5 +21,5 @@ <p><label for="test_case_version">Version</label><br/> <%= text_field 'test_case', 'version' %></p> -<!--[eoform:test]--> +<!--[eoform:test_case]--> Modified: trunk/stp-ror/app/views/test_cases/edit.rhtml =================================================================== --- trunk/stp-ror/app/views/test_cases/edit.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_cases/edit.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -1,9 +1,9 @@ <h1>Editing test case</h1> -<%= start_form_tag :action => 'update', :id => @test %> +<%= start_form_tag :action => 'update', :id => @test_case %> <%= render :partial => 'form' %> <%= submit_tag 'Edit' %> <%= end_form_tag %> -<%= link_to 'Show', :action => 'show', :id => @test %> | +<%= link_to 'Show', :action => 'show', :id => @test_case %> | <%= link_to 'Back', :action => 'list' %> Modified: trunk/stp-ror/app/views/test_cases/list.rhtml =================================================================== --- trunk/stp-ror/app/views/test_cases/list.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_cases/list.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -6,10 +6,10 @@ <th>Description</th> </tr> -<% for test in @test_cases %> +<% for test_case in @test_cases %> <tr> - <td valign="top"><%= test['descriptor'] %></td> - <td valign="top"><%= test['description'] %></td> + <td valign="top"><%= test_case['descriptor'] %></td> + <td valign="top"><%= test_case['description'] %></td> <td valign="top"> <%= link_to 'Show', :action => 'show', :id => test_case %> </td> @@ -28,4 +28,4 @@ <br /> -<%= link_to 'New test', :action => 'new' %> +<%= link_to 'New test case', :action => 'new' %> Modified: trunk/stp-ror/app/views/test_requests/_list_stripes.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/_list_stripes.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_requests/_list_stripes.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -17,7 +17,7 @@ </td> <td> [<%= link_to 'Cancel', {:action => 'cancel', :id => list_stripes.id}, - :confirm => 'Are you sure you want to cancel this test?' %>] + :confirm => 'Are you sure you want to cancel this test request?' %>] </td> <% end %> </tr> Modified: trunk/stp-ror/app/views/test_requests/_new.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/_new.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_requests/_new.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -6,9 +6,10 @@ <td align="right" valign="top">Test:</td> <td> <%= select 'test_request', 'test_case_id', TestCase.find(:all, - :order => 'descriptor').collect { |t| [ t.descriptor, t.id] }, + :select => 'id, descriptor', + :order => 'descriptor').collect { |t| [t.descriptor, t.id] }, { :include_blank => true } %> - <%= observe_field 'test_request_test_id', :frequency => 0.5, + <%= observe_field 'test_request_test_case_id', :frequency => 0.5, :update =>'test_options_div', :url => { :action => 'test_options' } %> </td> Modified: trunk/stp-ror/app/views/test_requests/_test_options.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/_test_options.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_requests/_test_options.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -1,14 +1,14 @@ <p> Linux Distribution: <%= select 'test_request', 'distro_id', - @test.distros.collect { |d| [d.descriptor, d.id ] }, + @test_case.distros.collect { |d| [d.descriptor, d.id ] }, { :include_blank => true } %> <%= observe_field 'test_request_distro_id', :frequency => 0.5, :update => 'distro_options_div', :url => { :action => 'distro_options' } %> </p> -<% if @test.parameters.length > 0 then %> +<% if @test_case.parameters.length > 0 then %> <p> <table> <caption>Test Options</caption> @@ -17,16 +17,16 @@ <th>Value</th> <th>Description</th> </tr> - <%= render_collection_of_partials 'parameter', @test.parameters %> + <%= render_collection_of_partials 'parameter', @test_case.parameters %> </table> </p> <% end %> -<% if @test.softwares.length > 0 then %> +<% if @test_case.softwares.length > 0 then %> <p> <table> <caption>Software Components</caption> - <%= render_collection_of_partials "software", @test.softwares %> + <%= render_collection_of_partials "software", @test_case.softwares %> </table> </p> <% end %> Modified: trunk/stp-ror/app/views/test_requests/edit.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/edit.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_requests/edit.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -4,13 +4,13 @@ <table> <tr> <td align="right" valign="top">ID:</td> - <td><%= @test_request.test[:id] %></td> + <td><%= @test_request.test_case[:id] %></td> </tr> <tr> <td align="right" valign="top">Test:</td> <td> - <%= @test_request.test[:descriptor] %> (You can't change this, cancel - on the previous page and create a new one.) + <%= @test_request.test_case[:descriptor] %> (You can't change this, + cancel on the previous page and create a new one.) </td> </tr> <tr> @@ -18,8 +18,8 @@ <td> <select id="test_request_host_type_id" name="test_request[host_type_id]"> - <%= options_from_collection_for_select @test_request.test.host_types, "id", - "descriptor", @test_request.host_type_id %> + <%= options_from_collection_for_select @test_request.test_case.host_types, + "id", "descriptor", @test_request.host_type_id %> </select> </td> </tr> @@ -27,8 +27,8 @@ <td align="right" valign="top">Linux Distribution:</td> <td> <select id="test_request_distro_id" name="test_request[distro_id]"> - <%= options_from_collection_for_select @test_request.test.distros, "id", "descriptor", - @test_request.distro_id %> + <%= options_from_collection_for_select @test_request.test_case.distros, + "id", "descriptor", @test_request.distro_id %> </select> </td> </tr> @@ -46,7 +46,7 @@ <%= render_collection_of_partials "parameter", @test_request.parameters %> </table> <% end %> -<% if @test_request.test.softwares.length > 0 then %> +<% if @test_request.test_case.softwares.length > 0 then %> <hr /> <table> <caption>Software Components</caption> Modified: trunk/stp-ror/app/views/test_requests/search.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/search.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_requests/search.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -43,7 +43,8 @@ <td> <select id="test_request_test_id" name="test_request[test_case_id]"> <option value="Any">Any</option> - <%= options_from_collection_for_select @tests, 'id', 'descriptor' %> + <%= options_from_collection_for_select @test_cases, 'id', + 'descriptor' %> </select> </td> </tr> Modified: trunk/stp-ror/app/views/test_requests/search_result.rhtml =================================================================== --- trunk/stp-ror/app/views/test_requests/search_result.rhtml 2006-04-03 20:46:56 UTC (rev 267) +++ trunk/stp-ror/app/views/test_requests/search_result.rhtml 2006-04-03 21:27:38 UTC (rev 268) @@ -22,5 +22,5 @@ <p> <%= link_to 'New test request', :action => 'new' %> | - <%= link_to 'Search test results', :action => 'search' %> + <%= link_to 'Search test request results', :action => 'search' %> </p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <fi...@us...> - 2006-04-03 20:47:00
|
Revision: 267 Author: fimath Date: 2006-04-03 13:46:56 -0700 (Mon, 03 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=267&view=rev Log Message: ----------- Cleaned up formatting. Replaces tabs with spaces, lined up indents, and broke up lines longer than 80 characters. Modified Paths: -------------- trunk/stp-ror/app/apis/test_request_service.rb trunk/stp-ror/app/apis/user_api.rb Modified: trunk/stp-ror/app/apis/test_request_service.rb =================================================================== --- trunk/stp-ror/app/apis/test_request_service.rb 2006-04-03 20:37:19 UTC (rev 266) +++ trunk/stp-ror/app/apis/test_request_service.rb 2006-04-03 20:46:56 UTC (rev 267) @@ -131,7 +131,8 @@ :conditions => ['test_request_id = ?', test_request_id]) test_request_ids = Array.new for test_request_item in test_requests - test_request_ids.push({ 'test_request_id' => test_request_item['id'], 'test_case_id' => test_request_item['test_case_id']}) + test_request_ids.push({ 'test_request_id' => test_request_item['id'], + 'test_case_id' => test_request_item['test_case_id']}) end return test_request_ids end @@ -143,18 +144,16 @@ test_request_details = Array.new for test_request in test_requests test_request_detail = TestRequestDetail.new({ - 'environment' => test_request['environment'], - 'id' => test_request['id'], - 'linux_append' => test_request['linux_append'], - 'test_case_descriptor' => test_request.test_case['descriptor'], - 'test_request_state_name' => - test_request.test_request_state['name'], - 'sysctl' => test_request['sysctl'], - 'test_version' => test_request.test_case['version'], - 'source_location' => test_request.test_case['source_location'], - 'continue_on_fail' => test_request['continue_on_fail'], - 'run_order' => test_request['run_order'] }) - + 'environment' => test_request['environment'], + 'id' => test_request['id'], + 'linux_append' => test_request['linux_append'], + 'test_case_descriptor' => test_request.test_case['descriptor'], + 'test_request_state_name' => test_request.test_request_state['name'], + 'sysctl' => test_request['sysctl'], + 'test_version' => test_request.test_case['version'], + 'source_location' => test_request.test_case['source_location'], + 'continue_on_fail' => test_request['continue_on_fail'], + 'run_order' => test_request['run_order'] }) test_request_details.push(test_request_detail) end return test_request_details @@ -162,15 +161,17 @@ def update_metrics(test_request_id, test_case_id, results) my_metrics = Metric.find(:all, - :select => 'id, descriptor', - :conditions => ['test_case_id = 0 or test_case_id = ?', test_case_id]) + :select => 'id, descriptor', + :conditions => ['test_case_id = 0 or test_case_id = ?', test_case_id]) test_request = TestRequest.find(:first, test_request_id, :select => 'id') for metrics_details in my_metrics # Insert into database from arg results if ( results.has_key?(metrics_details.descriptor) ) - myval = results[metrics_details.descriptor] - # INSERT INTO metrics_test_requests( id, test_request_id, metric_id, result ) VALUES ( 0, ?, ?, ? ); - metrics_details.test_requests.push_with_attributes(test_request, :value => myval ) + myval = results[metrics_details.descriptor] + # INSERT INTO metrics_test_requests( id, test_request_id, metric_id, + # result ) VALUES ( 0, ?, ?, ? ); + metrics_details.test_requests.push_with_attributes(test_request, + :value => myval ) end end return true Modified: trunk/stp-ror/app/apis/user_api.rb =================================================================== --- trunk/stp-ror/app/apis/user_api.rb 2006-04-03 20:37:19 UTC (rev 266) +++ trunk/stp-ror/app/apis/user_api.rb 2006-04-03 20:46:56 UTC (rev 267) @@ -4,7 +4,6 @@ class UserApi < ActionWebService::API::Base api_method :get_user_email_by_id, - :expects => [ - { :user_id => :int }], + :expects => [{ :user_id => :int }], :returns => [:string] end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jud...@us...> - 2006-04-03 20:37:26
|
Revision: 266 Author: judith_osdl Date: 2006-04-03 13:37:19 -0700 (Mon, 03 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=266&view=rev Log Message: ----------- Fix a missing '}' and the return is on else. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Admin/DataFile.pm Modified: trunk/Test-Sut/lib/Test/Admin/DataFile.pm =================================================================== --- trunk/Test-Sut/lib/Test/Admin/DataFile.pm 2006-04-03 19:39:31 UTC (rev 265) +++ trunk/Test-Sut/lib/Test/Admin/DataFile.pm 2006-04-03 20:37:19 UTC (rev 266) @@ -92,6 +92,7 @@ my $object_type = 'build_set'; if (@{$data} > -1){ $writer->startTag($object_type); + } else { return 0; } my $set_name = 'package_set'; @@ -101,7 +102,7 @@ "descriptor" => $unit->{'descriptor'}, "install_priority" => $unit->{'install_priority'}); # now write any direct packages - foreach my $pkg (@{$unit->{'packages'}){ + foreach my $pkg (@{$unit->{'packages'}}){ $writer->emptyTag('package', "descriptor" => $pkg->{'descriptor'}, "directory" => $pkg->{'directory'}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <fi...@us...> - 2006-04-03 19:39:33
|
Revision: 265 Author: fimath Date: 2006-04-03 12:39:31 -0700 (Mon, 03 Apr 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=265&view=rev Log Message: ----------- Changed the default database hostnames back to localhost. I probably committed the change by accident. Modified Paths: -------------- trunk/stp-ror/config/database.yml Modified: trunk/stp-ror/config/database.yml =================================================================== --- trunk/stp-ror/config/database.yml 2006-04-03 18:15:33 UTC (rev 264) +++ trunk/stp-ror/config/database.yml 2006-04-03 19:39:31 UTC (rev 265) @@ -8,7 +8,7 @@ development: adapter: postgresql database: stp_development - host: db.testdev.pdx.osdl.net + host: localhost username: stp_admin password: stp_admin @@ -23,14 +23,14 @@ test: adapter: postgresql database: stp_test - host: db.testdev.pdx.osdl.net + host: localhost username: stp_admin password: stp_admin production: adapter: postgresql database: stp_production - host: db.testdev.pdx.osdl.net + host: localhost username: stp_admin password: stp_admin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
70 messages has been excluded from this view by a project administrator.
