Merge branch '8465-cwl-containers-stdin-stderr' closes #8465

[arvados.git] / services / api / test / unit / node_test.rb

diff --git a/services/api/test/unit/node_test.rb b/services/api/test/unit/node_test.rb
index f9e0f4bc08fe35bc2bd14afddeb6cd7699eb9e26..2330e7c528f6a304b05cf318fcc2482e91e62b8d 100644 (file)
--- a/services/api/test/unit/node_test.rb
+++ b/services/api/test/unit/node_test.rb
@@ -1,4 +1,6 @@
 require 'test_helper'
+require 'tmpdir'
+require 'tempfile'
 
 class NodeTest < ActiveSupport::TestCase
   def ping_node(node_name, ping_data)
@@ -76,12 +78,14 @@ class NodeTest < ActiveSupport::TestCase
     assert Node.dns_server_update 'compute65535', '127.0.0.127'
   end
 
-  test "dns update with dir configured but no command configured" do
-    Rails.configuration.dns_server_update_command = false
-    Rails.configuration.dns_server_conf_dir = Rails.root.join 'tmp'
-    conffile = Rails.root.join 'tmp', 'compute65535.conf'
-    assert Node.dns_server_update 'compute65535', '127.0.0.127'
-    refute File.exist? conffile
+  test "don't leave temp files behind if there's an error writing them" do
+    Rails.configuration.dns_server_conf_template = Rails.root.join 'config', 'unbound.template'
+    Tempfile.any_instance.stubs(:puts).raises(IOError)
+    Dir.mktmpdir do |tmpdir|
+      Rails.configuration.dns_server_conf_dir = tmpdir
+      refute Node.dns_server_update 'compute65535', '127.0.0.127'
+      assert_empty Dir.entries(tmpdir).select{|f| File.file? f}
+    end
   end
 
   test "ping new node with no hostname and default config" do