contained_mr 0.1.2 → 0.2.0

data/test/test_job.rb

@@ -1,11 +1,12 @@
 require 'helper'
+require_relative 'concerns/job_state_cases.rb'
 
 class TestJob < MiniTest::Test
   def setup
-    @template = ContainedMr::Template.new 'contained_mrtests', 'hello',
+    @template = ContainedMr.new_template 'contained_mrtests', 'hello',
         StringIO.new(File.binread('testdata/hello.zip'))
-    @job = ContainedMr::Job.new @template, 'testjob',
-                                JSON.load(File.read('testdata/job.hello'))
+    @job = @template.new_job 'testjob',
+        JSON.load(File.read('testdata/job.hello'))
   end
 
   def teardown
@@ -13,46 +14,13 @@ class TestJob < MiniTest::Test
     @template.destroy!
   end
 
-  def test_mapper_container_options
-    @job.build_mapper_image File.read('testdata/input.hello')
-
-    golden = {
-      'name' => 'contained_mrtests_mapper.testjob.2',
-      'Image' => @job.mapper_image_id,
-      'Hostname' => '2.mapper',
-      'Domainname' => '',
-      'Labels' => { 'contained_mr.ctl' => 'contained_mrtests' },
-      'Env' => [ 'ITEM=2', 'ITEMS=3' ],
-      'Ulimits' => [
-        { 'Name' => 'cpu', 'Hard' => 3, 'Soft' => 3 },
-        { 'Name' => 'rss', 'Hard' => 1000000, 'Soft' => 1000000 },
-      ],
-      'NetworkDisabled' => true, 'ExposedPorts' => {},
-    }
-    assert_equal golden, @job.mapper_container_options(2)
-  end
-
-  def test_reducer_container_options
-    golden = {
-      'name' => 'contained_mrtests_reducer.testjob',
-      'Image' => @job.mapper_image_id,
-      'Hostname' => 'reducer',
-      'Domainname' => '',
-      'Labels' => { 'contained_mr.ctl' => 'contained_mrtests' },
-      'Env' => [ 'ITEMS=3' ],
-      'Ulimits' => [
-        { 'Name' => 'cpu', 'Hard' => 2, 'Soft' => 2 },
-        { 'Name' => 'rss', 'Hard' => 100000, 'Soft' => 100000 },
-      ],
-      'NetworkDisabled' => true, 'ExposedPorts' => {},
-    }
-    assert_equal golden, @job.reducer_container_options
-  end
-
   def test_build_mapper_image
     assert_equal 'contained_mrtests/mapper.testjob', @job.mapper_image_tag
 
-    @job.build_mapper_image File.read('testdata/input.hello')
+    assert_equal nil, @job.mapper_image_id
+    mapper_return = @job.build_mapper_image File.read('testdata/input.hello')
+    assert_equal mapper_return, @job.mapper_image_id
+
     image = Docker::Image.get @job.mapper_image_tag
     assert image, 'Docker::Image'
     assert_operator image.id, :start_with?, @job.mapper_image_id
@@ -63,10 +31,22 @@ class TestJob < MiniTest::Test
     assert_nil @job.reducer_runner, "Reducer started prematurely"
   end
 
+  def test_created_mapper_image_tags
+    @job.build_mapper_image File.read('testdata/input.hello')
+
+    images = Docker::Image.all
+    image = images.find { |i| i.id.start_with? @job.mapper_image_id }
+    assert image, 'Docker::Image in collection returned by Docker::Image.all'
+    assert image.info['RepoTags'], "Image missing RepoTags: #{image.inspect}"
+    assert_includes image.info['RepoTags'],
+        'contained_mrtests/mapper.testjob:latest'
+  end
+
   def test_run_mapper_stderr
     @job.build_mapper_image File.read('testdata/input.hello')
-    @job.run_mapper 2
+    runner = @job.run_mapper 2
 
+    assert_equal runner, @job.mapper_runner(2), 'mapper_runner return'
     assert_nil @job.mapper_runner(1), 'Mapper 1 started prematurely'
     assert_nil @job.mapper_runner(3), 'Mapper 3 started prematurely'
     assert_nil @job.reducer_runner, 'Reducer started prematurely'
@@ -106,6 +86,13 @@ class TestJob < MiniTest::Test
     assert_operator image.id, :start_with?, @job.reducer_image_id
 
     assert_nil @job.reducer_runner, "Reducer started prematurely"
+
+    images = Docker::Image.all
+    image = images.find { |i| i.id.start_with? @job.reducer_image_id }
+    assert image, 'Docker::Image in collection returned by Docker::Image.all'
+    assert image.info['RepoTags'], "Image missing RepoTags: #{image.inspect}"
+    assert_includes image.info['RepoTags'],
+        'contained_mrtests/reducer.testjob:latest'
   end
 
   def test_run_reducer
@@ -114,7 +101,7 @@ class TestJob < MiniTest::Test
     @job.build_reducer_image
     reducer = @job.run_reducer
 
-    assert @job.reducer_runner, 'reducer_runner return'
+    assert_equal reducer, @job.reducer_runner, 'reducer_runner return'
     assert_equal "3 /\n", reducer.stderr, 'Stderr: $ITEMS + $PWD'
 
     output_gold = "1\n2\n3\n" +
@@ -140,7 +127,7 @@ class TestJob < MiniTest::Test
     1.upto(3) { |i| @job.run_mapper i }
     @job.build_reducer_image
 
-    @job.destroy!
+    assert_equal @job, @job.destroy!
 
     assert_raises Docker::Error::NotFoundError do
       Docker::Image.get @job.mapper_image_tag
@@ -155,13 +142,13 @@ class TestJob < MiniTest::Test
     1.upto(3) { |i| @job.run_mapper i }
     @job.build_reducer_image
 
-    job2 = ContainedMr::Job.new @template, 'testjob2',
-                                JSON.load(File.read('testdata/job.hello'))
+    job2 = @template.new_job 'testjob2',
+        JSON.load(File.read('testdata/job.hello'))
     job2.build_mapper_image File.read('testdata/input.hello')
     1.upto(3) { |i| job2.run_mapper i }
     job2.build_reducer_image
 
-    job2.destroy!
+    assert_equal job2, job2.destroy!
 
     assert_raises Docker::Error::NotFoundError do
       Docker::Image.get job2.mapper_image_tag
@@ -176,7 +163,7 @@ class TestJob < MiniTest::Test
     image = Docker::Image.get @job.reducer_image_tag
     assert image, "destroy! wiped the other job's reducer image"
 
-    @job.destroy!
+    assert_equal @job, @job.destroy!
 
     assert_raises Docker::Error::NotFoundError do
       Docker::Image.get @job.mapper_image_tag
@@ -185,4 +172,6 @@ class TestJob < MiniTest::Test
       Docker::Image.get @job.reducer_image_tag
     end
   end
+
+  include JobStateCases
 end

data/test/test_job_logic.rb

@@ -0,0 +1,52 @@
+require 'helper'
+
+class TestJobLogic < MiniTest::Test
+  def setup
+    ContainedMr.stubs(:template_class).returns ContainedMr::Mock::Template
+    @template = ContainedMr.new_template 'contained_mrtests', 'hello',
+        StringIO.new(File.binread('testdata/hello.zip'))
+    @job = @template.new_job 'testjob',
+        JSON.load(File.read('testdata/job.hello'))
+  end
+
+  def test_mapper_container_options
+    assert_equal @template, @job.template
+    assert_equal 'contained_mrtests', @job.name_prefix
+    assert_equal 'testjob', @job.id
+    assert_equal 3, @job.item_count
+
+    @job.build_mapper_image File.read('testdata/input.hello')
+
+    golden = {
+      'name' => 'contained_mrtests_mapper.testjob.2',
+      'Image' => @job.mapper_image_id,
+      'Hostname' => '2.mapper',
+      'Domainname' => '',
+      'Labels' => { 'contained_mr.ctl' => 'contained_mrtests' },
+      'Env' => [ 'ITEM=2', 'ITEMS=3' ],
+      'Ulimits' => [
+        { 'Name' => 'cpu', 'Hard' => 3, 'Soft' => 3 },
+        { 'Name' => 'rss', 'Hard' => 1000000, 'Soft' => 1000000 },
+      ],
+      'NetworkDisabled' => true, 'ExposedPorts' => {},
+    }
+    assert_equal golden, @job.mapper_container_options(2)
+  end
+
+  def test_reducer_container_options
+    golden = {
+      'name' => 'contained_mrtests_reducer.testjob',
+      'Image' => @job.mapper_image_id,
+      'Hostname' => 'reducer',
+      'Domainname' => '',
+      'Labels' => { 'contained_mr.ctl' => 'contained_mrtests' },
+      'Env' => [ 'ITEMS=3' ],
+      'Ulimits' => [
+        { 'Name' => 'cpu', 'Hard' => 2, 'Soft' => 2 },
+        { 'Name' => 'rss', 'Hard' => 100000, 'Soft' => 100000 },
+      ],
+      'NetworkDisabled' => true, 'ExposedPorts' => {},
+    }
+    assert_equal golden, @job.reducer_container_options
+  end
+end

data/test/test_mock_job.rb

@@ -0,0 +1,94 @@
+require 'helper'
+require_relative 'concerns/job_state_cases.rb'
+
+class TestMockJob < MiniTest::Test
+  def setup
+    ContainedMr.stubs(:template_class).returns ContainedMr::Mock::Template
+    @template = ContainedMr.new_template 'contained_mrtests', 'hello',
+        StringIO.new(File.binread('testdata/hello.zip'))
+    @job = ContainedMr::Mock::Job.new @template, 'testjob',
+        JSON.load(File.read('testdata/job.hello'))
+  end
+
+  def test_mocking_setup
+    assert_instance_of ContainedMr::Mock::Template, @template
+    assert_instance_of ContainedMr::Mock::Job, @job
+  end
+
+  def test_constructor_readers
+    assert_equal @template, @job.template
+    assert_equal 'contained_mrtests', @job.name_prefix
+    assert_equal 'testjob', @job.id
+    assert_equal 3, @job.item_count
+
+    assert_equal 2.5, @job._json_options['mapper']['wait_time']
+    assert_equal nil, @job._mapper_input
+  end
+
+  def test_build_mapper_image
+    input = File.read('testdata/input.hello')
+
+    assert_equal nil, @job.mapper_image_id
+    assert_equal 'mock-job-mapper-image-id', @job.build_mapper_image(input)
+    assert_equal 'mock-job-mapper-image-id', @job.mapper_image_id
+
+    assert_equal input, @job._mapper_input
+  end
+
+  def test_run_mapper
+    @job.build_mapper_image File.read('testdata/input.hello')
+
+    mock_runner = @job._mock_mapper_runner 2
+    assert_equal nil, @job.mapper_runner(2)
+    assert_equal mock_runner, @job.run_mapper(2)
+    assert_equal mock_runner, @job.mapper_runner(2)
+
+    assert_equal 2.5, mock_runner._time_limit
+  end
+
+  def test_mock_mapper_runner
+    assert_raises ArgumentError do
+      @job._mock_mapper_runner 4
+    end
+    mock_runners = (1..3).map { |i| @job._mock_mapper_runner i }
+    assert_operator mock_runners[0], :!=, mock_runners[1]
+    assert_operator mock_runners[0], :!=, mock_runners[2]
+    assert_operator mock_runners[1], :!=, mock_runners[2]
+
+    @job.build_mapper_image File.read('testdata/input.hello')
+
+    assert_equal mock_runners[0], @job.run_mapper(1)
+    assert_equal mock_runners[1], @job.run_mapper(2)
+    assert_equal mock_runners[2], @job.run_mapper(3)
+  end
+
+  def test_build_reducer_image
+    @job.build_mapper_image File.read('testdata/input.hello')
+    1.upto(3) { |i| @job.run_mapper i }
+
+    assert_equal nil, @job.reducer_image_id
+    assert_equal 'mock-job-reducer-image-id', @job.build_reducer_image
+    assert_equal 'mock-job-reducer-image-id', @job.reducer_image_id
+  end
+
+  def test_run_reducer
+    @job.build_mapper_image File.read('testdata/input.hello')
+    1.upto(3) { |i| @job.run_mapper i }
+    @job.build_reducer_image
+
+    mock_runner = @job._mock_reducer_runner
+    assert_equal nil, @job.reducer_runner
+    assert_equal mock_runner, @job.run_reducer
+    assert_equal mock_runner, @job.reducer_runner
+
+    assert_equal 2, mock_runner._time_limit
+  end
+
+  def test_destroy
+    assert_equal false, @job.destroyed?
+    assert_equal @job, @job.destroy!
+    assert_equal true, @job.destroyed?
+  end
+
+  include JobStateCases
+end

data/test/test_mock_runner.rb

@@ -0,0 +1,99 @@
+require 'helper'
+
+class TestMockRunner < MiniTest::Test
+  def setup
+    @container_options =  {
+      'name' => 'contained_mrtests_mapper.testjob.2',
+      'Image' => 'mapperimageid',
+      'Hostname' => '2.mapper',
+      'Domainname' => '',
+      'Labels' => { 'contained_mr.ctl' => 'contained_mrtests' },
+      'Env' => [ 'ITEM=2', 'ITEMS=3' ],
+      'Ulimits' => [
+        { 'Name' => 'cpu', 'Hard' => 3, 'Soft' => 3 },
+        { 'Name' => 'rss', 'Hard' => 1000000, 'Soft' => 1000000 },
+      ],
+      'NetworkDisabled' => true, 'ExposedPorts' => {},
+    }
+    @runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                            '/usr/mrd/map-output'
+  end
+
+  def test_constructor_readers
+    assert_equal @container_options, @runner._container_options
+    assert_equal 2.5, @runner._time_limit
+    assert_equal '/usr/mrd/map-output', @runner._output_path
+  end
+
+  def test_perform
+    assert_equal false, @runner.performed?
+    assert_equal @runner, @runner.perform
+    assert_equal true, @runner.performed?
+  end
+
+  def test_destroy
+    assert_equal false, @runner.destroyed?
+    assert_equal @runner, @runner.destroy!
+    assert_equal true, @runner.destroyed?
+  end
+
+  def test_json_file
+    @runner._mock_set status_code: 1, timed_out: true
+
+    golden_json = { ran_for: nil, exit_code: 1, timed_out: true }
+    assert_equal golden_json, @runner.json_file
+  end
+
+  def test_mock_set
+    assert_equal nil, @runner.started_at
+    assert_equal nil, @runner.ended_at
+    assert_equal nil, @runner.status_code
+    assert_equal nil, @runner.timed_out
+    assert_equal nil, @runner.stdout
+    assert_equal nil, @runner.stderr
+    assert_equal nil, @runner.output
+
+    t0 = Time.now
+    t1 = t0 + 42
+    @runner._mock_set started_at: t0, ended_at: t1, status_code: 1,
+        timed_out: false, stdout: 'Hello world!',
+        stderr: 'Nothing to see here', output: 'Ohai'
+
+    assert_equal t0, @runner.started_at
+    assert_equal t1, @runner.ended_at
+    assert_equal 1, @runner.status_code
+    assert_equal false, @runner.timed_out
+    assert_equal 'Hello world!', @runner.stdout
+    assert_equal 'Nothing to see here', @runner.stderr
+    assert_equal 'Ohai', @runner.output
+  end
+
+  def test_ulimit
+    assert_equal 3, @runner._ulimit('cpu')
+    assert_equal 1000000, @runner._ulimit('rss')
+    assert_equal nil, @runner._ulimit('nothing')
+  end
+
+  def test_ulimit_with_mismatched_values
+    @container_options['Ulimits'][0]['Hard'] = 1
+    runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                           '/usr/mrd/map-output'
+    assert_equal 1000000, runner._ulimit('rss')
+
+    begin
+      runner._ulimit('cpu')
+      flunk 'No exception thrown'
+    rescue RuntimeError => e
+      assert_instance_of RuntimeError, e
+      assert_equal 'Hard/soft ulimit mismatch for cpu', e.message
+    end
+  end
+
+  def test_ulimit_with_missing_ulimits_array
+    @container_options.delete 'Ulimits'
+    runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                           '/usr/mrd/map-output'
+    assert_equal nil, runner._ulimit('cpu')
+    assert_equal nil, runner._ulimit('rss')
+  end
+end

data/test/test_mock_template.rb

@@ -0,0 +1,39 @@
+require 'helper'
+
+class TestMockTemplate < MiniTest::Test
+  def setup
+    ContainedMr.stubs(:template_class).returns ContainedMr::Mock::Template
+    @template = ContainedMr.new_template 'contained_mrtests', 'hello',
+        StringIO.new(File.binread('testdata/hello.zip'))
+  end
+
+  def test_mocking_setup
+    assert_instance_of ContainedMr::Mock::Template, @template
+  end
+
+  def test_constructor_readers
+    assert_equal 'contained_mrtests', @template.name_prefix
+    assert_equal 'hello', @template.id
+  end
+
+  def test_image_id
+    assert_equal 'mock-template-image-id', @template.image_id
+  end
+
+  def test_definition
+    assert_equal 3, @template.item_count
+    assert_equal '/usr/mrd/map-output',
+        @template._definition['mapper']['output']
+  end
+
+  def test_zip_contents
+    assert_equal "Hello world!\n", @template._zip_contents['data/hello.txt']
+    assert_equal :directory, @template._zip_contents['data/']
+  end
+
+  def test_destroy
+    assert_equal false, @template.destroyed?
+    @template.destroy!
+    assert_equal true, @template.destroyed?
+  end
+end

data/test/test_runner.rb

@@ -2,10 +2,10 @@ require 'helper'
 
 class TestRunner < MiniTest::Test
   def setup
-    @template = ContainedMr::Template.new 'contained_mrtests', 'hello',
+    @template = ContainedMr.new_template 'contained_mrtests', 'hello',
         StringIO.new(File.binread('testdata/hello.zip'))
-    @job = ContainedMr::Job.new @template, 'testjob',
-                                JSON.load(File.read('testdata/job.hello'))
+    @job = @template.new_job 'testjob',
+        JSON.load(File.read('testdata/job.hello'))
     @job.build_mapper_image File.read('testdata/input.hello')
   end
 
@@ -17,7 +17,7 @@ class TestRunner < MiniTest::Test
   def test_perform_happy_path
     runner = ContainedMr::Runner.new @job.mapper_container_options(2), 2.5,
                                      @template.mapper_output_path
-    runner.perform
+    assert_equal runner, runner.perform
 
     assert_equal nil, runner.container_id, 'container still running'
     assert_operator runner.ended_at - runner.started_at, :<, 1, 'running time'
@@ -27,23 +27,30 @@ class TestRunner < MiniTest::Test
     assert_equal "2\nmapper input file\nHello world!\n", runner.stdout,
                  'Stdout: $ITEM + mapper input file + data file'
     assert_equal "2\n", runner.output, 'Output: ITEM env variable'
+
+    assert_equal runner.ended_at - runner.started_at,
+                 runner.json_file[:ran_for]
+    assert_equal 0, runner.json_file[:exit_code]
+    assert_equal false, runner.json_file[:timed_out]
   end
 
   def test_perform_exit_code
     runner = ContainedMr::Runner.new @job.mapper_container_options(3), 2.5,
                                      @template.mapper_output_path
-    runner.perform
+    assert_equal runner, runner.perform
 
     assert_equal nil, runner.container_id, 'container still running'
     assert_operator runner.ended_at - runner.started_at, :<, 1, 'running time'
     assert_equal 42, runner.status_code, 'status code'
     assert_equal false, runner.timed_out, 'timed out'
+
+    assert_equal 42, runner.json_file[:exit_code]
   end
 
   def test_perform_timeout
     runner = ContainedMr::Runner.new @job.mapper_container_options(1), 2.5,
                                      @template.mapper_output_path
-    runner.perform
+    assert_equal runner, runner.perform
 
     assert_equal nil, runner.container_id, 'container still running'
     assert_equal false, runner.status_code, 'status code'
@@ -52,5 +59,13 @@ class TestRunner < MiniTest::Test
                     'running time'
     assert_operator runner.ended_at - runner.started_at, :<, 2.8,
                     'running time'
+
+    assert_equal true, runner.json_file[:timed_out]
+  end
+
+  def test_destroy_without_perform
+    runner = ContainedMr::Runner.new @job.mapper_container_options(2), 2.5,
+                                     @template.mapper_output_path
+    assert_equal runner, runner.destroy!
   end
 end

data/test/test_runner_logic.rb

@@ -0,0 +1,51 @@
+require 'helper'
+
+class TestRunnerLogic < MiniTest::Test
+  def setup
+    @container_options =  {
+      'name' => 'contained_mrtests_mapper.testjob.2',
+      'Image' => 'mapperimageid',
+      'Hostname' => '2.mapper',
+      'Domainname' => '',
+      'Labels' => { 'contained_mr.ctl' => 'contained_mrtests' },
+      'Env' => [ 'ITEM=2', 'ITEMS=3' ],
+      'Ulimits' => [
+        { 'Name' => 'cpu', 'Hard' => 3, 'Soft' => 3 },
+        { 'Name' => 'rss', 'Hard' => 1000000, 'Soft' => 1000000 },
+      ],
+      'NetworkDisabled' => true, 'ExposedPorts' => {},
+    }
+    @runner = ContainedMr::Mock::Runner.new @container_options, 2.5,
+                                            '/usr/mrd/map-output'
+  end
+
+  def test_ran_for_with_nil_start_end
+    assert_equal nil, @runner.ran_for
+  end
+
+  def test_ran_for_with_nil_end
+    @runner._mock_set started_at: Time.now
+    assert_equal nil, @runner.ran_for
+  end
+
+  def test_ran_for_with_nil_start
+    @runner._mock_set ended_at: Time.now
+    assert_equal nil, @runner.ran_for
+  end
+
+  def test_ran_for_with_start_and_end
+    t0 = Time.now
+    @runner._mock_set started_at: t0, ended_at: t0 + 42
+    assert_equal 42, @runner.ran_for
+  end
+
+  def test_json_file
+    t0 = Time.now
+    t1 = t0 + 42
+    @runner._mock_set started_at: t0, ended_at: t1, status_code: 1,
+                      timed_out: false
+
+    golden_json = { ran_for: 42, exit_code: 1, timed_out: false }
+    assert_equal golden_json, @runner.json_file
+  end
+end

data/test/test_template.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class TestTemplate < MiniTest::Test
   def setup
-    @template = ContainedMr::Template.new 'contained_mrtests', 'hello',
+    @template = ContainedMr.new_template 'contained_mrtests', 'hello',
         StringIO.new(File.binread('testdata/hello.zip'))
   end
 
@@ -11,48 +11,35 @@ class TestTemplate < MiniTest::Test
   end
 
   def test_image_id_matches_created_image
+    assert_equal 'contained_mrtests', @template.name_prefix
+    assert_equal 'hello', @template.id
+
     image = Docker::Image.get @template.image_tag
     assert image, 'Docker::Image'
     assert_operator image.id, :start_with?, @template.image_id
   end
 
-  def test_image_tag
-    assert_equal 'contained_mrtests/base.hello', @template.image_tag
-  end
-
-  def test_dockerfiles
-    golden = File.read 'testdata/Dockerfile.hello.mapper'
-    golden.sub! 'contained_mrtests/base.hello', @template.image_id
-    assert_equal golden, @template.mapper_dockerfile, 'mapper Dockerfile'
-
-    golden = File.read 'testdata/Dockerfile.hello.reducer'
-    golden.sub! 'contained_mrtests/base.hello', @template.image_id
-    assert_equal golden, @template.reducer_dockerfile, 'reducer Dockerfile'
-  end
-
-  def test_paths
-    assert_equal '/usr/mrd/map-output', @template.mapper_output_path
-    assert_equal '/usr/mrd/reduce-output', @template.reducer_output_path
-  end
-
-  def test_envs
-    assert_equal 3, @template.item_count
-    assert_equal ['ITEM=2', 'ITEMS=3'], @template.mapper_env(2)
-    assert_equal ['ITEMS=3'], @template.reducer_env
+  def test_created_image_tags
+    images = Docker::Image.all
+    image = images.find { |i| i.id.start_with? @template.image_id }
+    assert image, 'Docker::Image in collection returned by Docker::Image.all'
+    assert image.info['RepoTags'], "Image missing RepoTags: #{image.inspect}"
+    assert_includes image.info['RepoTags'],
+        'contained_mrtests/base.hello:latest'
   end
 
   def test_destroy
-    @template.destroy!
+    assert_equal @template, @template.destroy!
     assert_raises Docker::Error::NotFoundError do
       Docker::Image.get @template.image_tag
     end
   end
 
   def test_destory_with_two_templates
-    template2 = ContainedMr::Template.new 'contained_mrtests', 'hello2',
+    template2 = ContainedMr.new_template 'contained_mrtests', 'hello2',
         StringIO.new(File.binread('testdata/hello.zip'))
 
-    template2.destroy!
+    assert_equal template2, template2.destroy!
     assert_raises Docker::Error::NotFoundError do
       Docker::Image.get template2.image_tag
     end
@@ -60,7 +47,7 @@ class TestTemplate < MiniTest::Test
     image = Docker::Image.get @template.image_tag
     assert image, "destroy! wiped the other template's image"
 
-    @template.destroy!
+    assert_equal @template, @template.destroy!
     assert_raises Docker::Error::NotFoundError do
       Docker::Image.get @template.image_tag
     end