December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> jr-yastmodel : implement permissions for model
by Josef Reidinger 21 Dec '09

21 Dec '09

ref: refs/heads/jr-yastmodel commit acbc131c52bb83c8a7ea652ec5d54e804b6472c6 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 21 14:58:28 2009 +0100 implement permissions for model --- webclient/lib/yast_model/base.rb | 15 ++++++++++++++- webclient/lib/yast_model/permission.rb | 4 ++++ webclient/test/unit/yast_model_test.rb | 9 +++++++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/webclient/lib/yast_model/base.rb b/webclient/lib/yast_model/base.rb index c4db5c7..5ccd297 100644 --- a/webclient/lib/yast_model/base.rb +++ b/webclient/lib/yast_model/base.rb @@ -15,9 +15,10 @@ module YastModel end def set_site + @permissions = nil #reset permission as it can be for each site and for each user different self.site = YaST::ServiceResource::Session.site self.password = YaST::ServiceResource::Session.auth_token - YastModel::Resource.site = "#{site}/" #resource has constant prefix to allow introspect + YastModel::Resource.site = "#{self.site}/" #resource has constant prefix to allow introspect #FIXME not thread save Rails.logger.debug "read interface to #{(a)interface.to_s}" resource = YastModel::Resource.find(:all).find { |r| r.interface.to_sym == @interface.to_sym } @@ -42,5 +43,17 @@ module YastModel instantiate_record( (connection.get(path, headers)), prefix_options ) end end + + def permissions + return @permissions if @permissions + YastModel::Permission.site = "#{self.site}/" #resource has constant prefix to allow introspect + permissions = YastModel::Permission.find :all, :params => { :user_id => YaST::ServiceResource::Session.login, :filter => @interface } + granted = permissions.collect { |p| p.granted ? p.id : nil } + granted.delete(nil) + @permissions = granted.collect { |p| + p.slice!("#{@interface}.") + p.to_sym + } + end end end diff --git a/webclient/lib/yast_model/permission.rb b/webclient/lib/yast_model/permission.rb new file mode 100644 index 0000000..c8a1877 --- /dev/null +++ b/webclient/lib/yast_model/permission.rb @@ -0,0 +1,4 @@ +module YastModel + class Permission < ActiveResource::Base + end +end diff --git a/webclient/test/unit/yast_model_test.rb b/webclient/test/unit/yast_model_test.rb index d1976e8..c57ce66 100644 --- a/webclient/test/unit/yast_model_test.rb +++ b/webclient/test/unit/yast_model_test.rb @@ -7,7 +7,7 @@ PERMISSION_RESPONSE= <<EOF <permissions type="array"> <permission> <granted type="boolean">true</granted> - <id>org.opensuse.yast.modules.yapi.ntp.synchronize</id> + <id>org.opensuse.yast.modules.test.synchronize</id> </permission> </permissions> EOF @@ -47,7 +47,7 @@ TEST2_STRING = "test2" def setup ActiveResource::HttpMock.respond_to do |mock| mock.get "/resources.xml", {}, RESOURCE_RESPONSE, 200 - mock.get "/permissions.xml", {}, PERMISSION_RESPONSE,200 + mock.get "//permissions.xml?filter=org.opensuse.yast.modules.test&user_id=test", {}, PERMISSION_RESPONSE,200 mock.get "/test.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST_RESPONSE, 200 mock.post "/test.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST_RESPONSE, 200 mock.get "/test2.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST2_RESPONSE, 200 @@ -93,4 +93,9 @@ def test_mix_of_two_models assert_equal "test2",Test2Model.collection_name end +def test_permissions + perm = TestModel.permissions + assert perm.include?(:synchronize), "permission is not available #{perm.inspect}" +end + end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60160 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/Makefile.am yast2-storage.spec.in
by aschnell＠svn.opensuse.org 21 Dec '09

21 Dec '09

Author: aschnell Date: Mon Dec 21 14:20:49 2009 New Revision: 60160 URL: http://svn.opensuse.org/viewcvs/yast?rev=60160&view=rev Log: - activated testsuite for partitioning proposal Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/Makefile.am trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=60160&r1=601… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Dec 21 14:20:49 2009 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Dec 21 14:20:49 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 21 14:17:30 CET 2009 - aschnell(a)suse.de + +- added testsuite for partitioning proposal +- 2.19.1 + +------------------------------------------------------------------- Tue Dec 15 10:42:21 CET 2009 - aschnell(a)suse.de - added proposal parameter "vm_keep_unpartitioned_region" (fate Modified: trunk/storage/storage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/Makefile.am?… ============================================================================== --- trunk/storage/storage/src/Makefile.am (original) +++ trunk/storage/storage/src/Makefile.am Mon Dec 21 14:20:49 2009 @@ -2,7 +2,7 @@ # Makefile.am for storage/storage/src # -SUBDIRS = include modules proposal +SUBDIRS = include modules proposal testsuite client_DATA = \ inst_custom_part.ycp \ Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Mon Dec 21 14:20:49 2009 @@ -6,7 +6,7 @@ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files BuildRequires: libstorage-devel >= 2.19.3 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools -BuildRequires: yast2-testsuite yast2-perl-bindings +BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19 yast2-libyui >= 2.18.7 Requires: yast2-dbus-client -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> jr-yastmodel : fix problem with settings variable in ancestor by using module instead of ancestor
by Josef Reidinger 21 Dec '09

21 Dec '09

ref: refs/heads/jr-yastmodel commit d7a3c651c0435263913a70a8e9a33986a13265b5 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 21 13:53:32 2009 +0100 fix problem with settings variable in ancestor by using module instead of ancestor --- webclient/lib/yast_model/base.rb | 32 +++++++++----------------------- webclient/test/unit/yast_model_test.rb | 6 ++++-- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/webclient/lib/yast_model/base.rb b/webclient/lib/yast_model/base.rb index 1df29b3..c4db5c7 100644 --- a/webclient/lib/yast_model/base.rb +++ b/webclient/lib/yast_model/base.rb @@ -1,44 +1,31 @@ module YastModel - class Base < ActiveResource::Base - self.logger = Rails.logger #avoid problem with nil logger + module Base - class << self def model_interface(i) - @@interface = i.to_sym + @interface = i.to_sym end - alias_method :site_orig, :site def site - ret = site_orig + ret = super if ret.nil? || ret != URI.parse(YaST::ServiceResource::Session.site) || password != YaST::ServiceResource::Session.auth_token set_site end - return site_orig + return super end def set_site - site = YaST::ServiceResource::Session.site - self.site = site + self.site = YaST::ServiceResource::Session.site self.password = YaST::ServiceResource::Session.auth_token YastModel::Resource.site = "#{site}/" #resource has constant prefix to allow introspect #FIXME not thread save - Rails.logger.debug "read interface to #{@@interface.to_s}" - resource = YastModel::Resource.find(:all).find { |r| r.interface.to_sym == @@interface.to_sym } + Rails.logger.debug "read interface to #{(a)interface.to_s}" + resource = YastModel::Resource.find(:all).find { |r| r.interface.to_sym == @interface.to_sym } #TODO throw exception if not find - p, sep, @@collection_name = resource.href.rpartition('/') + p, sep, self.collection_name = resource.href.rpartition('/') p += '/' self.prefix = p - @@element_name = @@collection_name - end - -#redefine collection name as it is little broken see http://lists.opensuse.org/opensuse-ruby/2009-12/msg00008.html - def collection_name - @@collection_name - end - - def element_name - @@element_name + self.element_name = collection_name end #fix ARs broken singleton @@ -54,7 +41,6 @@ module YastModel path = self.collection_path(prefix_options, query_options) instantiate_record( (connection.get(path, headers)), prefix_options ) end - end end end end diff --git a/webclient/test/unit/yast_model_test.rb b/webclient/test/unit/yast_model_test.rb index 0ec995b..d1976e8 100644 --- a/webclient/test/unit/yast_model_test.rb +++ b/webclient/test/unit/yast_model_test.rb @@ -58,10 +58,12 @@ def setup YaST::ServiceResource::Session.auth_token = "1234" end -class TestModel < YastModel::Base +class TestModel < ActiveResource::Base + extend YastModel::Base model_interface :'org.opensuse.yast.modules.test' end -class Test2Model < YastModel::Base +class Test2Model < ActiveResource::Base + extend YastModel::Base model_interface :'org.opensuse.yast.modules.test2' end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> jr-yastmodel : add test that show problem with setting class variables in ancestor
by Josef Reidinger 21 Dec '09

21 Dec '09

ref: refs/heads/jr-yastmodel commit fecd679bfb7b5b0f1fbdf251a82a4fd4c968f719 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 21 13:38:17 2009 +0100 add test that show problem with setting class variables in ancestor --- webclient/test/unit/yast_model_test.rb | 36 +++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/webclient/test/unit/yast_model_test.rb b/webclient/test/unit/yast_model_test.rb index f5d048d..0ec995b 100644 --- a/webclient/test/unit/yast_model_test.rb +++ b/webclient/test/unit/yast_model_test.rb @@ -20,6 +20,12 @@ RESOURCE_RESPONSE = <<EOF <singular type="boolean">true</singular> <href>/test</href> </resource> + <resource> + <interface>org.opensuse.yast.modules.test2</interface> + <policy/> + <singular type="boolean">true</singular> + <href>/test2</href> + </resource> </resources> EOF @@ -29,12 +35,23 @@ TEST_RESPONSE = <<EOF </test> EOF +TEST2_RESPONSE = <<EOF +<test2> + <arg1>test2</arg1> +</test2> +EOF + +TEST_STRING = "test" +TEST2_STRING = "test2" + def setup ActiveResource::HttpMock.respond_to do |mock| mock.get "/resources.xml", {}, RESOURCE_RESPONSE, 200 mock.get "/permissions.xml", {}, PERMISSION_RESPONSE,200 mock.get "/test.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST_RESPONSE, 200 mock.post "/test.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST_RESPONSE, 200 + mock.get "/test2.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST2_RESPONSE, 200 + mock.post "/test2.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST2_RESPONSE, 200 end YaST::ServiceResource::Session.site = "http://localhost" YaST::ServiceResource::Session.login = "test" @@ -44,6 +61,9 @@ end class TestModel < YastModel::Base model_interface :'org.opensuse.yast.modules.test' end +class Test2Model < YastModel::Base + model_interface :'org.opensuse.yast.modules.test2' +end def test_model assert TestModel.site.to_s.include?('localhost'), "site doesn't include localhost : #{TestModel.site}" @@ -51,14 +71,24 @@ def test_model assert_equal "/",TestModel.prefix end -def test_find +def test_find_and_save begin test = TestModel.find :one - assert_equal "test",test.arg1 + assert_equal TEST_STRING,test.arg1 assert test.save ensure - puts ActiveResource::HttpMock.requests.inspect + Rails.logger.debug ActiveResource::HttpMock.requests.inspect end end +def test_mix_of_two_models + test = TestModel.find :one + assert_equal TEST_STRING,test.arg1 + test2 = Test2Model.find :one + assert_equal TEST2_STRING,test2.arg1 + assert_equal TEST_STRING,test.arg1 + assert_equal "test",TestModel.collection_name + assert_equal "test2",Test2Model.collection_name +end + end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> jr-yastmodel : properly set element name to generate correct XML, test saving
by Josef Reidinger 21 Dec '09

21 Dec '09

ref: refs/heads/jr-yastmodel commit b40c6c59a902ea700edb1a867a87f2b9b0d990aa Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 21 13:25:11 2009 +0100 properly set element name to generate correct XML, test saving --- webclient/lib/yast_model/base.rb | 5 +++++ webclient/test/unit/yast_model_test.rb | 4 +++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/webclient/lib/yast_model/base.rb b/webclient/lib/yast_model/base.rb index 98af103..1df29b3 100644 --- a/webclient/lib/yast_model/base.rb +++ b/webclient/lib/yast_model/base.rb @@ -29,6 +29,7 @@ module YastModel p, sep, @@collection_name = resource.href.rpartition('/') p += '/' self.prefix = p + @@element_name = @@collection_name end #redefine collection name as it is little broken see http://lists.opensuse.org/opensuse-ruby/2009-12/msg00008.html @@ -36,6 +37,10 @@ module YastModel @@collection_name end + def element_name + @@element_name + end + #fix ARs broken singleton def find_one(options) case from = options[:from] diff --git a/webclient/test/unit/yast_model_test.rb b/webclient/test/unit/yast_model_test.rb index b15ba31..f5d048d 100644 --- a/webclient/test/unit/yast_model_test.rb +++ b/webclient/test/unit/yast_model_test.rb @@ -34,6 +34,7 @@ def setup mock.get "/resources.xml", {}, RESOURCE_RESPONSE, 200 mock.get "/permissions.xml", {}, PERMISSION_RESPONSE,200 mock.get "/test.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST_RESPONSE, 200 + mock.post "/test.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST_RESPONSE, 200 end YaST::ServiceResource::Session.site = "http://localhost" YaST::ServiceResource::Session.login = "test" @@ -53,7 +54,8 @@ end def test_find begin test = TestModel.find :one - assert "test",test.arg1 + assert_equal "test",test.arg1 + assert test.save ensure puts ActiveResource::HttpMock.requests.inspect end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> jr-yastmodel : fix http mock to expect authentification
by Josef Reidinger 21 Dec '09

21 Dec '09

ref: refs/heads/jr-yastmodel commit 459443dee32878b093a39842ec4fc9ae2f6e921f Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 21 13:10:10 2009 +0100 fix http mock to expect authentification --- webclient/test/unit/yast_model_test.rb | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/webclient/test/unit/yast_model_test.rb b/webclient/test/unit/yast_model_test.rb index d013678..b15ba31 100644 --- a/webclient/test/unit/yast_model_test.rb +++ b/webclient/test/unit/yast_model_test.rb @@ -33,7 +33,7 @@ def setup ActiveResource::HttpMock.respond_to do |mock| mock.get "/resources.xml", {}, RESOURCE_RESPONSE, 200 mock.get "/permissions.xml", {}, PERMISSION_RESPONSE,200 - mock.get "/test.xml", {}, TEST_RESPONSE, 200 + mock.get "/test.xml", {"Authorization"=>"Basic OjEyMzQ="}, TEST_RESPONSE, 200 end YaST::ServiceResource::Session.site = "http://localhost" YaST::ServiceResource::Session.login = "test" @@ -46,15 +46,17 @@ end def test_model assert TestModel.site.to_s.include?('localhost'), "site doesn't include localhost : #{TestModel.site}" - puts YastModel::Base.collection_name - puts TestModel.collection_name assert_equal "test",TestModel.collection_name assert_equal "/",TestModel.prefix end def test_find - test = TestModel.find :one - assert "test",test.arg1 + begin + test = TestModel.find :one + assert "test",test.arg1 + ensure + puts ActiveResource::HttpMock.requests.inspect + end end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60159 - /trunk/storage/storage/src/testsuite/Makefile.am
by aschnell＠svn.opensuse.org 21 Dec '09

21 Dec '09

Author: aschnell Date: Mon Dec 21 12:55:19 2009 New Revision: 60159 URL: http://svn.opensuse.org/viewcvs/yast?rev=60159&view=rev Log: - setup environment for testsuite during package build Modified: trunk/storage/storage/src/testsuite/Makefile.am Modified: trunk/storage/storage/src/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/Ma… ============================================================================== --- trunk/storage/storage/src/testsuite/Makefile.am (original) +++ trunk/storage/storage/src/testsuite/Makefile.am Mon Dec 21 12:55:19 2009 @@ -4,9 +4,19 @@ # Do not edit this file (Makefile.am) as it will be overwritten! # +SUBDIRS = data + AUTOMAKE_OPTIONS = dejagnu EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +Y2BASEFLAGS = -M $(top_builddir)/bindings/ycp +export Y2BASEFLAGS + +Y2BASE_LD_LIBRARY_PATH = $(top_builddir)/bindings/src/.libs +Y2BASE_Y2DIR = $(top_builddir)/bindings/src/.libs +export Y2BASE_LD_LIBRARY_PATH +export Y2BASE_Y2DIR + testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite all-local: $(testsuite_prepare) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60158 - /trunk/storage/storage/src/testsuite/run/runtest.sh
by aschnell＠svn.opensuse.org 21 Dec '09

21 Dec '09

Author: aschnell Date: Mon Dec 21 12:52:01 2009 New Revision: 60158 URL: http://svn.opensuse.org/viewcvs/yast?rev=60158&view=rev Log: - updated to skeleton version Modified: trunk/storage/storage/src/testsuite/run/runtest.sh Modified: trunk/storage/storage/src/testsuite/run/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/ru… ============================================================================== --- trunk/storage/storage/src/testsuite/run/runtest.sh (original) +++ trunk/storage/storage/src/testsuite/run/runtest.sh Mon Dec 21 12:52:01 2009 @@ -77,7 +77,7 @@ rm -f "$file" } -( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" +( Y2DIR=$Y2DIR:$Y2BASE_Y2DIR LD_LIBRARY_PATH=$Y2BASE_LD_LIBRARY_PATH $Y2BASE -l - -c "$logconf" $Y2BASEFLAGS $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" retcode="$PIPESTATUS" if [ "$retcode" -gt 0 ]; then -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60157 - /tags/stable-2_19_0/testsuite/
by aschnell＠svn.opensuse.org 21 Dec '09

21 Dec '09

Author: aschnell Date: Mon Dec 21 12:47:07 2009 New Revision: 60157 URL: http://svn.opensuse.org/viewcvs/yast?rev=60157&view=rev Log: Created tag stable-2_19_0 for testsuite Added: tags/stable-2_19_0/testsuite/ - copied from r60156, trunk/testsuite/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60156 - in /trunk/testsuite: VERSION package/yast2-testsuite.changes skel/Makefile.testsuite.in skel/runtest.sh yast2-testsuite.spec.in
by aschnell＠svn.opensuse.org 21 Dec '09

21 Dec '09

Author: aschnell Date: Mon Dec 21 12:45:37 2009 New Revision: 60156 URL: http://svn.opensuse.org/viewcvs/yast?rev=60156&view=rev Log: - don't override Makefile.am - extended runtest.sh Modified: trunk/testsuite/VERSION trunk/testsuite/package/yast2-testsuite.changes trunk/testsuite/skel/Makefile.testsuite.in trunk/testsuite/skel/runtest.sh trunk/testsuite/yast2-testsuite.spec.in Modified: trunk/testsuite/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/VERSION?rev=60156&r1=6… ============================================================================== --- trunk/testsuite/VERSION (original) +++ trunk/testsuite/VERSION Mon Dec 21 12:45:37 2009 @@ -1 +1 @@ -2.17.0 +2.19.0 Modified: trunk/testsuite/package/yast2-testsuite.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/package/yast2-testsuit… ============================================================================== --- trunk/testsuite/package/yast2-testsuite.changes (original) +++ trunk/testsuite/package/yast2-testsuite.changes Mon Dec 21 12:45:37 2009 @@ -1,8 +1,14 @@ ------------------------------------------------------------------- +Mon Dec 21 12:07:52 CET 2009 - aschnell(a)suse.de + +- don't override Makefile.am +- extended runtest.sh +- 2.19.0 + +------------------------------------------------------------------- Fri Dec 11 16:07:09 CET 2009 - aschnell(a)suse.de - run all tests even if some fail -- 2.17.0 ------------------------------------------------------------------- Mon Jun 29 12:19:01 CEST 2009 - mvidner(a)suse.cz Modified: trunk/testsuite/skel/Makefile.testsuite.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/skel/Makefile.testsuit… ============================================================================== --- trunk/testsuite/skel/Makefile.testsuite.in (original) +++ trunk/testsuite/skel/Makefile.testsuite.in Mon Dec 21 12:45:37 2009 @@ -14,7 +14,7 @@ files_config=$(srcdir)/config/default.exp $(srcdir)/config/unix.exp $(srcdir)/config/unknown.exp files_run=$(srcdir)/run/runtest.sh files_test=$(srcdir)/$(RPMNAME).test/testsuite.exp -files_tmpl=$(srcdir)/Makefile.am +#files_tmpl=$(srcdir)/Makefile.am files_all=$(files_config) $(files_test) $(files_tmpl) $(files_run) all: $(files_all) $(testsuite_dirs) @@ -28,8 +28,8 @@ # Overwrite the tested package's testsuite/Makefile.am only # if the template file is newer in content (which shouldn't # happen as it is only a proxy). Prevents automake mismatch errors. -$(srcdir)/Makefile.am: $(skeldir)/Makefile_am - cmp -s $< $@ || cp -f $< $@ +#$(srcdir)/Makefile.am: $(skeldir)/Makefile_am +# cmp -s $< $@ || cp -f $< $@ $(srcdir)/run/runtest.sh: $(skeldir)/runtest.sh run cp -f $< $@ Modified: trunk/testsuite/skel/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/skel/runtest.sh?rev=60… ============================================================================== --- trunk/testsuite/skel/runtest.sh (original) +++ trunk/testsuite/skel/runtest.sh Mon Dec 21 12:45:37 2009 @@ -77,7 +77,7 @@ rm -f "$file" } -( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" +( Y2DIR=$Y2DIR:$Y2BASE_Y2DIR LD_LIBRARY_PATH=$Y2BASE_LD_LIBRARY_PATH $Y2BASE -l - -c "$logconf" $Y2BASEFLAGS $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" retcode="$PIPESTATUS" if [ "$retcode" -gt 0 ]; then Modified: trunk/testsuite/yast2-testsuite.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/yast2-testsuite.spec.i… ============================================================================== --- trunk/testsuite/yast2-testsuite.spec.in (original) +++ trunk/testsuite/yast2-testsuite.spec.in Mon Dec 21 12:45:37 2009 @@ -6,7 +6,7 @@ BuildRequires: openslp-devel perl-XML-Writer popt-devel yast2-core-devel yast2-devtools yast2-ycp-ui-bindings Requires: expect dejagnu # y2base -I includepath -M modulepath -Requires: yast2-core >= 2.16.45 +Requires: yast2-core >= 2.19.0 Summary: YaST2 - Testsuite BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0