Andrew Bogott has submitted this change and it was merged.

Change subject: Mark some tests as 'pending'
......................................................................


Mark some tests as 'pending'

These tests were already marked invalid for puppet 2.6.x, seems
they fail on 2.7.x as well.

Change-Id: Ib7181923f09a2f31e597bf0c5779f0067195cc6b
---
M modules/stdlib/spec/unit/puppet/parser/functions/getvar_spec.rb
M modules/stdlib/spec/unit/puppet/parser/functions/has_key_spec.rb
M modules/stdlib/spec/unit/puppet/parser/functions/merge_spec.rb
3 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/stdlib/spec/unit/puppet/parser/functions/getvar_spec.rb 
b/modules/stdlib/spec/unit/puppet/parser/functions/getvar_spec.rb
index 5ff834e..e69cbdc 100644
--- a/modules/stdlib/spec/unit/puppet/parser/functions/getvar_spec.rb
+++ b/modules/stdlib/spec/unit/puppet/parser/functions/getvar_spec.rb
@@ -7,6 +7,7 @@
 
     it "should not compile when no arguments are passed" do
       pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      pending("Fails on 2.7.x, see bug #15912") if Puppet.version =~ /^2\.7\./
       Puppet[:code] = '$foo = getvar()'
       expect {
         scope.compiler.compile
@@ -15,6 +16,7 @@
 
     it "should not compile when too many arguments are passed" do
       pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      pending("Fails on 2.7.x, see bug #15912") if Puppet.version =~ /^2\.7\./
       Puppet[:code] = '$foo = getvar("foo::bar", "baz")'
       expect {
         scope.compiler.compile
@@ -23,6 +25,7 @@
 
     it "should lookup variables in other namespaces" do
       pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      pending("Fails on 2.7.x, see bug #15912") if Puppet.version =~ /^2\.7\./
       Puppet[:code] = <<-'ENDofPUPPETcode'
         class site::data { $foo = 'baz' }
         include site::data
diff --git a/modules/stdlib/spec/unit/puppet/parser/functions/has_key_spec.rb 
b/modules/stdlib/spec/unit/puppet/parser/functions/has_key_spec.rb
index 490daea..23f3095 100644
--- a/modules/stdlib/spec/unit/puppet/parser/functions/has_key_spec.rb
+++ b/modules/stdlib/spec/unit/puppet/parser/functions/has_key_spec.rb
@@ -7,6 +7,7 @@
   describe 'when calling has_key from puppet' do
     it "should not compile when no arguments are passed" do
       pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      pending("Fails on 2.7.x, see bug #15912") if Puppet.version =~ /^2\.7\./
       Puppet[:code] = '$x = has_key()'
       expect {
         scope.compiler.compile
@@ -15,6 +16,7 @@
 
     it "should not compile when 1 argument is passed" do
       pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      pending("Fails on 2.7.x, see bug #15912") if Puppet.version =~ /^2\.7\./
       Puppet[:code] = "$x = has_key('foo')"
       expect {
         scope.compiler.compile
@@ -23,6 +25,7 @@
 
     it "should require the first value to be a Hash" do
       pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      pending("Fails on 2.7.x, see bug #15912") if Puppet.version =~ /^2\.7\./
       Puppet[:code] = "$x = has_key('foo', 'bar')"
       expect {
         scope.compiler.compile
diff --git a/modules/stdlib/spec/unit/puppet/parser/functions/merge_spec.rb 
b/modules/stdlib/spec/unit/puppet/parser/functions/merge_spec.rb
index db7d837..df709c1 100644
--- a/modules/stdlib/spec/unit/puppet/parser/functions/merge_spec.rb
+++ b/modules/stdlib/spec/unit/puppet/parser/functions/merge_spec.rb
@@ -8,6 +8,7 @@
   describe 'when calling merge from puppet' do
     it "should not compile when no arguments are passed" do
       pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      pending("Fails on 2.7.x, see bug #15912") if Puppet.version =~ /^2\.7\./
       Puppet[:code] = '$x = merge()'
       expect {
         scope.compiler.compile
@@ -16,6 +17,7 @@
 
     it "should not compile when 1 argument is passed" do
       pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      pending("Fails on 2.7.x, see bug #15912") if Puppet.version =~ /^2\.7\./
       Puppet[:code] = "$my_hash={'one' => 1}\n$x = merge($my_hash)"
       expect {
         scope.compiler.compile

-- 
To view, visit https://gerrit.wikimedia.org/r/73186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7181923f09a2f31e597bf0c5779f0067195cc6b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to