sous-chefsGH-910 Fix merge conficts from PR

Reduce duplicated tests for tags

Signed-off-by: Christian Leinweber <[email protected]>

spec/docker_test/image_spec.rb

@@ -250,12 +250,6 @@
       )
     end
 
-    it 'pushes docker_image[localhost:5043/someara/name.w.dots] with tag v0.1.1' do
-      expect(chef_run).to push_docker_image('localhost:5043/someara/name.w.dots').with(
-        tag: 'v0.1.1'
-      )
-    end
-
     it 'login docker_registry[localhost:5043]' do
       expect(chef_run).to login_docker_registry('localhost:5043').with(
         username: 'testuser',

test/cookbooks/docker_test/recipes/image.rb

@@ -279,14 +279,6 @@
   action :tag
 end
 
-docker_tag 'private repo tag for name.w.dots v0.1.1' do
-  target_repo 'busybox'
-  target_tag 'latest'
-  to_repo 'localhost:5043/someara/name.w.dots'
-  to_tag 'v0.1.1'
-  action :tag
-end
-
 docker_registry 'localhost:5043' do
   username 'testuser'
   password 'testpassword'
@@ -313,12 +305,6 @@
   action :push
 end
 
-docker_image 'localhost:5043/someara/name.w.dots' do
-  not_if { ::File.exist?('/marker_image_private_name.w.dots') }
-  tag 'v0.1.1'
-  action :push
-end
-
 file '/marker_image_private_name.w.dots' do
   action :create
 end

test/integration/resources-17061/inspec/assert_functioning_spec.rb

@@ -136,11 +136,6 @@
   its(:stdout) { should match(%r{^localhost\:5043/someara/name\.w\.dots\s.*v0.1.0}) }
 end
 
-describe command('docker images') do
-  its(:exit_status) { should eq 0 }
-  its(:stdout) { should match(%r{^localhost\:5043/someara/name\.w\.dots\s.*v0.1.1}) }
-end
-
 # FIXME: We need to test the "docker_registry" stuff...
 # I can't figure out how to search the local registry to see if the
 # authentication and :push actions in the test recipe actually worked.