Re-enable tests

yast · Oct 24, 2017 · 3642c19 · 3642c19
1 parent a6809d8
commit 3642c19
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 65 deletions.
diff --git a/test/AutoInstallRules_test.rb b/test/AutoInstallRules_test.rb
@@ -2,17 +2,9 @@
 
 require_relative "test_helper"
 
-# storage-ng
-=begin
 Yast.import "AutoInstallRules"
-=end
 
 describe "Yast::AutoInstallRules" do
-  # storage-ng
-  before :all do
-    skip("pending of storage-ng")
-  end
-
   subject { Yast::AutoInstallRules }
 
   let(:root_path) { File.expand_path('../..', __FILE__) }
@@ -28,14 +20,6 @@
       expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".etc.install_inf.XServer"))
       expect(Yast::Hostname).to receive(:CurrentDomain).and_return("mydomain.lan")
 
-      # storage-ng
-=begin
-      expect(Yast::StorageControllers).to receive(:Initialize)
-      expect(Yast::Storage).to receive(:GetTargetMap).and_return({})
-      expect(Yast::Storage).to receive(:GetForeignPrimary)
-      expect(Yast::Storage).to receive(:GetOtherLinuxPartitions)
-=end
-
       expect(Yast::OSRelease).to receive(:ReleaseInformation).
         and_return("SUSE Linux Enterprise Server 12")
       expect(Yast::OSRelease).to receive(:ReleaseVersion).

diff --git a/test/AutoInstall_test.rb b/test/AutoInstall_test.rb
@@ -2,16 +2,9 @@
 
 require_relative "test_helper"
 
-# storage-ng
-=begin
 Yast.import "AutoInstall"
-=end
 
 describe "Yast::AutoInstall" do
-  # storage-ng
-  before :all do
-    skip("pending of storage-ng")
-  end
 
   subject { Yast::AutoInstall }
 

diff --git a/test/AutoinstClass_test.rb b/test/AutoinstClass_test.rb
@@ -2,16 +2,9 @@
 
 require_relative "test_helper"
 
-# storage-ng
-=begin
 Yast.import "AutoinstClass"
-=end
 
 describe "Yast::AutoinstClass" do
-  # storage-ng
-  before :all do
-    skip("pending of storage-ng")
-  end
 
   subject { Yast::AutoinstClass }
 

diff --git a/test/AutoinstFunctions_test.rb b/test/AutoinstFunctions_test.rb
@@ -2,19 +2,12 @@
 
 require_relative "test_helper"
 
-# storage-ng
-=begin
 Yast.import "AutoinstFunctions"
 Yast.import "Stage"
 Yast.import "Mode"
 Yast.import "AutoinstConfig"
-=end
 
-describe "Yast::AutoinstFunctions" do
-  # storage-ng
-  before :all do
-    skip("pending of storage-ng")
-  end
+describe Yast::AutoinstFunctions do
 
   subject { Yast::AutoinstFunctions }
 

diff --git a/test/AutoinstSoftware_test.rb b/test/AutoinstSoftware_test.rb
@@ -2,12 +2,12 @@
 
 require_relative "test_helper"
 
-# storage-ng
 Yast.import "AutoinstSoftware"
 Yast.import "AutoinstData"
 Yast.import "Profile"
 
-describe "Yast::AutoinstSoftware" do
+describe Yast::AutoinstSoftware do
+
   subject { Yast::AutoinstSoftware }
 
   let(:profile) { FIXTURES_PATH.join("profiles", "software.xml").to_s }

diff --git a/test/Y2ModuleConfig_test.rb b/test/Y2ModuleConfig_test.rb
@@ -3,18 +3,11 @@
 require_relative "test_helper"
 require "yaml"
 
-# storage-ng
-=begin
 Yast.import "Y2ModuleConfig"
 Yast.import "Desktop"
 Yast.import "Profile"
-=end
 
-describe "Yast::Y2ModuleConfig" do
-  # storage-ng
-  before :all do
-    skip("pending of storage-ng")
-  end
+describe Yast::Y2ModuleConfig do
 
   DESKTOP_DATA = YAML::load_file(FIXTURES_PATH.join("desktop_files", "desktops.yml"))
 

diff --git a/test/include/ask_test.rb b/test/include/ask_test.rb
@@ -4,19 +4,11 @@
 
 require "yast"
 
-# storage-ng
-=begin
 Yast.import "Profile"
 Yast.import "Stage"
 Yast.import "UI"
-=end
 
 describe "Yast::AutoinstallAskInclude" do
-  # storage-ng
-  before :all do
-    skip("pending of storage-ng")
-  end
-
   module DummyYast
     class AutoinstallAskClient < Yast::Client
       def main

diff --git a/test/profile_test.rb b/test/profile_test.rb
@@ -2,19 +2,12 @@
 
 require_relative "test_helper"
 
-# storage-ng
-=begin
 Yast.import "Profile"
 Yast.import "Y2ModuleConfig"
 Yast.import "AutoinstClone"
-=end
 
-describe "Yast::Profile" do
-  # storage-ng
-  before :all do
-    skip("pending of storage-ng")
-  end
-
+describe Yast::Profile do
+
   CUSTOM_MODULE = {
     "Name" => "Custom module",
     "X-SuSE-YaST-AutoInst" => "configure",