Merge pull request #67 from shortdudey123/fix_serverspec

Fix serverspec verification
shortdudey123 · Sep 14, 2016 · f2c64e6 · f2c64e6
2 parents 23f58a5 + 4cf199f
commit f2c64e6
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -155,7 +155,7 @@ suites:
                 - "gluster1"
               replica_count: 2
               volume_type: "distributed-replicated"
-              size: "5 G"
+              size: "5G"
 
   - name: distributed-repl2
     driver:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - **[PR #62](https://github.com/shortdudey123/chef-gluster/pull/62)** - Fix undefined method error in server_extend recipe
 - **[PR #63](https://github.com/shortdudey123/chef-gluster/pull/63)** - Fix Ruby syntax per Rubocop
 - **[PR #66](https://github.com/shortdudey123/chef-gluster/pull/66)** - Update test-kitchen OS's
+- **[PR #67](https://github.com/shortdudey123/chef-gluster/pull/67)** - Fix serverspec verification
 
 ## v5.0.1 (2016-03-12)
 - **[PR #52](https://github.com/shortdudey123/chef-gluster/pull/52)** - Correct the usage of the peer_names attribute

diff --git a/test/integration/distributed-repl4/serverspec/server_spec.rb b/test/integration/distributed-repl4/serverspec/server_spec.rb
@@ -6,15 +6,15 @@
   end
 
   describe command('gluster volume status') do
-    its(:stdout) { should include('Brick gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('Brick gluster1:/data/gv0/brick') }
   end
 
   describe command('gluster volume info') do
     its(:stdout) { should include('Type: Distributed-Replicate') }
     its(:stdout) { should include('Number of Bricks: 2 x 2 = 4') }
-    its(:stdout) { should include('gluster4:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster3:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster2:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('gluster4:/data/gv0/brick') }
+    its(:stdout) { should include('gluster3:/data/gv0/brick') }
+    its(:stdout) { should include('gluster2:/data/gv0/brick') }
+    its(:stdout) { should include('gluster1:/data/gv0/brick') }
   end
 end
diff --git a/test/integration/distributed-striped4/serverspec/server_spec.rb b/test/integration/distributed-striped4/serverspec/server_spec.rb
@@ -6,15 +6,15 @@
   end
 
   describe command('gluster volume status') do
-    its(:stdout) { should include('Brick gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('Brick gluster1:/data/gv0/brick') }
   end
 
   describe command('gluster volume info') do
     its(:stdout) { should include('Type: Distributed-Stripe') }
     its(:stdout) { should include('Number of Bricks: 2 x 2 = 4') }
-    its(:stdout) { should include('gluster4:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster3:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster2:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('gluster4:/data/gv0/brick') }
+    its(:stdout) { should include('gluster3:/data/gv0/brick') }
+    its(:stdout) { should include('gluster2:/data/gv0/brick') }
+    its(:stdout) { should include('gluster1:/data/gv0/brick') }
   end
 end
diff --git a/test/integration/distributed2/serverspec/server_spec.rb b/test/integration/distributed2/serverspec/server_spec.rb
@@ -6,13 +6,13 @@
   end
 
   describe command('gluster volume status') do
-    its(:stdout) { should include('Brick gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('Brick gluster1:/data/gv0/brick') }
   end
 
   describe command('gluster volume info') do
     its(:stdout) { should include('Type: Distribute') }
     its(:stdout) { should include('Number of Bricks: 2') }
-    its(:stdout) { should include('gluster2:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('gluster2:/data/gv0/brick') }
+    its(:stdout) { should include('gluster1:/data/gv0/brick') }
   end
 end
diff --git a/test/integration/replicated2/serverspec/server_spec.rb b/test/integration/replicated2/serverspec/server_spec.rb
@@ -6,13 +6,13 @@
   end
 
   describe command('gluster volume status') do
-    its(:stdout) { should include('Brick gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('Brick gluster1:/data/gv0/brick') }
   end
 
   describe command('gluster volume info') do
     its(:stdout) { should include('Type: Replicate') }
     its(:stdout) { should include('Number of Bricks: 1 x 2 = 2') }
-    its(:stdout) { should include('gluster2:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('gluster2:/data/gv0/brick') }
+    its(:stdout) { should include('gluster1:/data/gv0/brick') }
   end
 end
diff --git a/test/integration/striped2/serverspec/server_spec.rb b/test/integration/striped2/serverspec/server_spec.rb
@@ -6,13 +6,13 @@
   end
 
   describe command('gluster volume status') do
-    its(:stdout) { should include('Brick gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('Brick gluster1:/data/gv0/brick') }
   end
 
   describe command('gluster volume info') do
     its(:stdout) { should include('Type: Stripe') }
     its(:stdout) { should include('Number of Bricks: 1 x 2 = 2') }
-    its(:stdout) { should include('gluster2:/data/sdb1/gv0') }
-    its(:stdout) { should include('gluster1:/data/sdb1/gv0') }
+    its(:stdout) { should include('gluster2:/data/gv0/brick') }
+    its(:stdout) { should include('gluster1:/data/gv0/brick') }
   end
 end