From 9f74ea044b7403e6d09a8c89054a975eebad22f4 Mon Sep 17 00:00:00 2001 From: Awais Jibran Date: Wed, 18 Mar 2020 20:43:20 +0500 Subject: [PATCH] Fix DeprecationWarning --- common/lib/xmodule/xmodule/tests/test_editing_module.py | 8 ++++---- .../tests}/test_files/test_tabseditingdescriptor.css | 0 .../tests}/test_files/test_tabseditingdescriptor.scss | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename common/lib/xmodule/{ => xmodule/tests}/test_files/test_tabseditingdescriptor.css (100%) rename common/lib/xmodule/{ => xmodule/tests}/test_files/test_tabseditingdescriptor.scss (100%) diff --git a/common/lib/xmodule/xmodule/tests/test_editing_module.py b/common/lib/xmodule/xmodule/tests/test_editing_module.py index acb73955dc..bcc185411a 100644 --- a/common/lib/xmodule/xmodule/tests/test_editing_module.py +++ b/common/lib/xmodule/xmodule/tests/test_editing_module.py @@ -33,13 +33,13 @@ class TabsEditingDescriptorTestCase(unittest.TestCase): 'scss': [ resource_string( __name__, - '../../test_files/test_tabseditingdescriptor.scss' + 'test_files/test_tabseditingdescriptor.scss' ) ], 'css': [ resource_string( __name__, - '../../test_files/test_tabseditingdescriptor.css' + 'test_files/test_tabseditingdescriptor.css' ) ] } @@ -66,8 +66,8 @@ class TabsEditingDescriptorTestCase(unittest.TestCase): def test_get_css(self): """test get_css""" css = self.descriptor.get_css() - test_files_dir = os.path.dirname(__file__).replace('xmodule/tests', 'test_files') - test_css_file = os.path.join(test_files_dir, 'test_tabseditingdescriptor.scss') + current_dir = os.path.dirname(__file__) + test_css_file = os.path.join(current_dir, 'test_files/test_tabseditingdescriptor.scss') with open(test_css_file) as new_css: added_css = new_css.read() self.assertEqual(css['scss'].pop().decode('utf-8'), added_css) diff --git a/common/lib/xmodule/test_files/test_tabseditingdescriptor.css b/common/lib/xmodule/xmodule/tests/test_files/test_tabseditingdescriptor.css similarity index 100% rename from common/lib/xmodule/test_files/test_tabseditingdescriptor.css rename to common/lib/xmodule/xmodule/tests/test_files/test_tabseditingdescriptor.css diff --git a/common/lib/xmodule/test_files/test_tabseditingdescriptor.scss b/common/lib/xmodule/xmodule/tests/test_files/test_tabseditingdescriptor.scss similarity index 100% rename from common/lib/xmodule/test_files/test_tabseditingdescriptor.scss rename to common/lib/xmodule/xmodule/tests/test_files/test_tabseditingdescriptor.scss