[DRE-commits] [librarian-puppet] 27/153: Fix tests now that puppetlabs-stdlib only includes metadata.json
Stig Sandbeck Mathisen
ssm at debian.org
Wed Jun 1 20:30:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
ssm pushed a commit to branch master
in repository librarian-puppet.
commit 43980c62a2ee47e9f7c387ee3cd7a642e101e81c
Author: Carlos Sanchez <csanchez at maestrodev.com>
Date: Thu Jul 17 14:34:29 2014 +0200
Fix tests now that puppetlabs-stdlib only includes metadata.json
---
features/install/forge.feature | 12 ++++++------
features/install/git.feature | 10 +++++-----
features/install/path.feature | 2 +-
features/package.feature | 6 +++---
features/update.feature | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/features/install/forge.feature b/features/install/forge.feature
index 74b83aa..8f80ef3 100644
--- a/features/install/forge.feature
+++ b/features/install/forge.feature
@@ -11,7 +11,7 @@ Feature: cli/install/forge
When I run `librarian-puppet install`
Then the exit status should be 0
And the file "modules/ntp/metadata.json" should match /"name": "puppetlabs-ntp"/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
Scenario: Installing an exact version of a module
Given a file named "Puppetfile" with:
@@ -24,7 +24,7 @@ Feature: cli/install/forge
Then the exit status should be 0
And the file "modules/apt/Modulefile" should match /name *'puppetlabs-apt'/
And the file "modules/apt/Modulefile" should match /version *'0\.0\.4'/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
# Puppet Module tool does not support spaces
# https://github.com/rodjek/librarian-puppet/issues/201
@@ -38,7 +38,7 @@ Feature: cli/install/forge
"""
When PENDING I run `librarian-puppet install`
Then the exit status should be 0
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
Scenario: Installing a module with invalid versions in the forge
Given a file named "Puppetfile" with:
@@ -67,7 +67,7 @@ Feature: cli/install/forge
Then the exit status should be 0
And the file "modules/apt/Modulefile" should match /name *'puppetlabs-apt'/
And the file "modules/apt/Modulefile" should match /version *'1\.0\.0'/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
Scenario: Changing the path
Given a directory named "puppet"
@@ -82,7 +82,7 @@ Feature: cli/install/forge
Then the exit status should be 0
And the output from "librarian-puppet config" should contain "path: puppet/modules"
And the file "puppet/modules/ntp/Modulefile" should match /name *'puppetlabs-ntp'/
- And the file "puppet/modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "puppet/modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
Scenario: Handle range version numbers
Given a file named "Puppetfile" with:
@@ -187,4 +187,4 @@ Feature: cli/install/forge
When I run `librarian-puppet install`
Then the exit status should be 0
And the file "modules/collectd/Modulefile" should match /name *'pdxcat-collectd'/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
diff --git a/features/install/git.feature b/features/install/git.feature
index bc00c42..8ae9a59 100644
--- a/features/install/git.feature
+++ b/features/install/git.feature
@@ -55,7 +55,7 @@ Feature: cli/install/git
Then the exit status should be 0
And the file "modules/postgresql/Modulefile" should match /name *'puppetlabs-postgresql'/
And the file "modules/postgresql/Modulefile" should match /version *'1\.0\.0'/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
When I overwrite "Puppetfile" with:
"""
forge "http://forge.puppetlabs.com"
@@ -68,7 +68,7 @@ Feature: cli/install/git
And the file "modules/postgresql/Modulefile" should match /name *'puppetlabs-postgresql'/
And the file "modules/postgresql/Modulefile" should match /version *'1\.0\.0'/
And the file "modules/postgresql/.git/HEAD" should match /183d401a3ffeb2e83372dfcc05f5b6bab25034b1/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
Scenario: Install a module with dependencies specified in a Puppetfile
Given a file named "Puppetfile" with:
@@ -110,7 +110,7 @@ Feature: cli/install/git
When I run `librarian-puppet install`
Then the exit status should be 0
And the file "modules/test/Modulefile" should match /version *'0\.0\.1'/
- And a file named "modules/stdlib/Modulefile" should exist
+ And a file named "modules/stdlib/metadata.json" should exist
Scenario: Install a module from git without version
Given a file named "Puppetfile" with:
@@ -122,7 +122,7 @@ Feature: cli/install/git
When I run `librarian-puppet install`
Then the exit status should be 0
And the file "modules/test/Modulefile" should match /version *'0\.0\.1'/
- And a file named "modules/stdlib/Modulefile" should exist
+ And a file named "modules/stdlib/metadata.json" should exist
@announce
Scenario: Install a module with mismatching Puppetfile and Modulefile
@@ -147,4 +147,4 @@ Feature: cli/install/git
"""
When PENDING I run `librarian-puppet install --verbose`
Then the exit status should be 0
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
diff --git a/features/install/path.feature b/features/install/path.feature
index 6f428da..f41894c 100644
--- a/features/install/path.feature
+++ b/features/install/path.feature
@@ -31,7 +31,7 @@ Feature: cli/install/path
When I run `librarian-puppet install`
Then the exit status should be 0
And the file "modules/test/Modulefile" should match /version *'0\.0\.1'/
- And a file named "modules/stdlib/Modulefile" should exist
+ And a file named "modules/stdlib/metadata.json" should exist
@spaces
Scenario: Installing a module in a path with spaces
diff --git a/features/package.feature b/features/package.feature
index 916ab38..9f2eb08 100644
--- a/features/package.feature
+++ b/features/package.feature
@@ -12,7 +12,7 @@ Feature: cli/package
When I run `librarian-puppet package --verbose`
Then the exit status should be 0
And the file "modules/apt/Modulefile" should match /name *'puppetlabs-apt'/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
And the following files should exist:
| vendor/puppet/cache/puppetlabs-apt-1.4.0.tar.gz |
| vendor/puppet/cache/puppetlabs-stdlib-4.1.0.tar.gz |
@@ -28,7 +28,7 @@ Feature: cli/package
When I run `librarian-puppet package --verbose`
Then the exit status should be 0
And the file "modules/apt/Modulefile" should match /name *'puppetlabs-apt'/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
And the following files should exist:
| vendor/puppet/source/924e89289b93db60ef0f16a4e71579fa88e037a6.tar.gz |
| vendor/puppet/cache/puppetlabs-stdlib-4.1.0.tar.gz |
@@ -45,7 +45,7 @@ Feature: cli/package
When I run `librarian-puppet package --verbose`
Then the exit status should be 0
And the file "modules/apt/Modulefile" should match /name *'puppetlabs-apt'/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
And the following files should exist:
| vendor/puppet/cache/puppetlabs-puppetlabs-apt-1.4.0.tar.gz |
| vendor/puppet/cache/puppetlabs-stdlib-4.1.0.tar.gz |
diff --git a/features/update.feature b/features/update.feature
index 576196d..74a48a0 100644
--- a/features/update.feature
+++ b/features/update.feature
@@ -21,7 +21,7 @@ Feature: cli/update
When I run `librarian-puppet update puppetlabs-stdlib`
Then the exit status should be 0
And the file "Puppetfile.lock" should match /puppetlabs.stdlib \(3\.1\.1\)/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
And the file "modules/stdlib/Modulefile" should match /version *'3\.1\.1'/
Scenario: Updating a module using organization/module
@@ -44,7 +44,7 @@ Feature: cli/update
When I run `librarian-puppet update --verbose puppetlabs/stdlib`
Then the exit status should be 0
And the file "Puppetfile.lock" should match /puppetlabs.stdlib \(3\.1\.1\)/
- And the file "modules/stdlib/Modulefile" should match /name *'puppetlabs-stdlib'/
+ And the file "modules/stdlib/metadata.json" should match /"name": "puppetlabs-stdlib"/
And the file "modules/stdlib/Modulefile" should match /version *'3\.1\.1'/
Scenario: Updating a module from git with a branch ref
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/librarian-puppet.git
More information about the Pkg-ruby-extras-commits
mailing list