Eliminate symlink causing tests to fail

openSUSE · Jun 13, 2018 · 9116284 · 9116284
1 parent 0d59a2f
commit 9116284
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/bin/rhel_unpack_salt.sh b/bin/rhel_unpack_salt.sh
@@ -17,5 +17,5 @@ rpm -ivh salt-*.src.rpm
 rm -f salt-*.src.rpm
 rpmbuild -bp /usr/src/packages/SPECS/salt.spec
 mkdir -p $SALT_SOURCES/src/
-ln -s /usr/src/packages/BUILD/salt-* $SALT_SOURCES/src/
+cp -R /usr/src/packages/BUILD/salt-* $SALT_SOURCES/src/
 exit 0
diff --git a/bin/sles_unpack_salt.sh b/bin/sles_unpack_salt.sh
@@ -13,5 +13,5 @@ echo '%_tmppath %{_topdir}/tmp' >> ~/.rpmmacros
 zypper -n si salt
 rpmbuild --without zsh_completion --without docs --without test -bp /usr/src/packages/SPECS/salt.spec
 mkdir -p $SALT_SOURCES/src/
-ln -s /usr/src/packages/BUILD/salt-* $SALT_SOURCES/src/
+cp -R /usr/src/packages/BUILD/salt-* $SALT_SOURCES/src/
 exit 0
diff --git a/conftest.py.source b/conftest.py.source
@@ -75,7 +75,6 @@ KNOWN_ISSUES_INTEGRATION = {
             # Always failing
             '*sysmod.py::SysModuleTest::test_valid_docs',
             'integration/cloud/providers/virtualbox.py::BaseVirtualboxTests::test_get_manager',
-            'integration/fileserver/roots_test.py::RootsTest::test_symlink_list',
 
             'integration/modules/timezone.py::TimezoneLinuxModuleTest::test_get_hwclock',
             'integration/states/git.py::GitTest::test_latest_changed_local_branch_rev_develop',