Merge pull request #2108 from getnikola/fix-2106

Fix 2106
getnikola · Sep 21, 2015 · e051a1d · e051a1d
2 parents 5ef0dba + 997b82b
commit e051a1d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Features
 Bugfixes
 --------
 
+* Fix false orphan report for code.css and robots.txt (Issue #2106)
 * Fix reST post list date formatting error (Issue #2104)
 * Deprecated ``RSS_TEASERS``, ``RSS_PLAIN``, ``RSS_READ_MORE_LINK``, and
   ``RSS_LINKS_APPEND_QUERY`` in favor of ``FEED_TEASERS``, ``FEED_PLAIN``,

diff --git a/nikola/plugins/task/copy_assets.py b/nikola/plugins/task/copy_assets.py
@@ -61,10 +61,7 @@ def gen_tasks(self):
         code_css_path = os.path.join(kw['output_folder'], 'assets', 'css', 'code.css')
         code_css_input = utils.get_asset_path('assets/css/code.css',
                                               themes=kw['themes'],
-                                              files_folders=kw['files_folders'])
-
-        kw["code.css_input"] = code_css_input
-
+                                              files_folders=kw['files_folders'], output_dir=None)
         yield self.group_task()
 
         for theme_name in kw['themes']:

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -307,18 +307,11 @@ class TestCheck(DemoBuildTest):
 
     def test_check_links(self):
         with cd(self.target_dir):
-            try:
-                __main__.main(['check', '-l'])
-            except SystemExit as e:
-                self.assertEqual(e.code, 0)
+            self.assertIsNone(__main__.main(['check', '-l']))
 
     def test_check_files(self):
         with cd(self.target_dir):
-            try:
-                __main__.main(['check', '-f'])
-            except SystemExit as e:
-                self.assertEqual(e.code, 0)
-
+            self.assertIsNone(__main__.main(['check', '-f']))
 
 class TestCheckAbsoluteSubFolder(TestCheck):
     """Validate links in a site which is: