tests: migrate tests for modifying classes to test_fresh

classids can get recycled, it seems.

3 files changed, 31 insertions, 35 deletions

diff --git a/test/integration.rb b/test/integration.rb
index 837bd1f..69725f3 100644
--- a/test/integration.rb
+++ b/test/integration.rb
@@ -11,8 +11,7 @@ class TestMogIntegration < Test::Unit::TestCase
   def setup
     @to_close = []
     @trackers = ENV["MOG_TEST_TRACKERS"].split(/,/)
-    now = Time.now
-    domain = "rbmogtest#{now.strftime('%Y%m%d%H%M%S')}.#{uuid}"
+    domain = "rbmogtest#{Time.now.strftime('%Y%m%d%H%M%S')}.#{uuid}"
     @admin = MogileFS::Admin.new(:hosts => @trackers)
     @admin.create_domain(domain)
     yield_for_monitor_update do
diff --git a/test/test_admin_integration.rb b/test/test_admin_integration.rb
deleted file mode 100644
index 79fdabc..0000000
--- a/test/test_admin_integration.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- encoding: binary -*-
-require './test/integration'
-
-class TestAdminIntegration < TestMogIntegration
-
-  def test_create_update_delete_class
-    assert_nothing_raised do
-      @admin.create_class(@domain, "klassy", 1)
-    end
-    assert_raises(MogileFS::Backend::ClassExistsError) do
-      @admin.create_class(@domain, "klassy", 1)
-    end
-
-    assert_nothing_raised do
-      @admin.update_class(@domain, "klassy",
-                          :mindevcount => 1, :replpolicy => "MultipleHosts(1)")
-    end
-
-    tmp = nil
-    yield_for_monitor_update do
-      tmp = @admin.get_domains[@domain]["klassy"]
-      break if tmp && tmp["replpolicy"] == "MultipleHosts(1)"
-    end
-    assert tmp, "domain did not show up"
-    assert_equal 1, tmp["mindevcount"]
-    assert_equal "MultipleHosts(1)", tmp["replpolicy"]
-    assert_nothing_raised { @admin.update_class(@domain, "klassy", 2) }
-    @admin.delete_class(@domain, "klassy") rescue nil
-    rescue
-      @admin.delete_class(@domain, "klassy") rescue nil
-      raise
-  end
-end
diff --git a/test/test_fresh.rb b/test/test_fresh.rb
index 89b37b6..1b0fa15 100644
--- a/test/test_fresh.rb
+++ b/test/test_fresh.rb
@@ -91,6 +91,36 @@ EOF
     assert_equal [], @admin.get_devices
   end
 
+  def test_create_update_delete_class
+    domain = "rbmogtest#{Time.now.strftime('%Y%m%d%H%M%S')}.#{uuid}"
+    @admin.create_domain(domain)
+    yield_for_monitor_update { @admin.get_domains.include?(domain) and break }
+
+    assert_nothing_raised do
+      @admin.create_class(domain, "klassy", 1)
+    end
+    assert_raises(MogileFS::Backend::ClassExistsError) do
+      @admin.create_class(domain, "klassy", 1)
+    end
+
+    assert_nothing_raised do
+      @admin.update_class(domain, "klassy",
+                          :mindevcount => 1, :replpolicy => "MultipleHosts(1)")
+    end
+
+    tmp = nil
+    yield_for_monitor_update do
+      tmp = @admin.get_domains[domain]["klassy"]
+      break if tmp && tmp["replpolicy"] == "MultipleHosts(1)"
+    end
+    assert tmp, "domain did not show up"
+    assert_equal 1, tmp["mindevcount"]
+    assert_equal "MultipleHosts(1)", tmp["replpolicy"]
+    assert_nothing_raised { @admin.update_class(domain, "klassy", 2) }
+    ensure
+      @admin.delete_class(domain, "klassy") rescue nil
+  end
+
   def teardown
     if @mogstored_pid && @mogstored_pid.size > 0
       Process.kill(:TERM, @mogstored_pid.read.to_i)