Fix modification of Cache_Control

The previous code modified the Cache_Control dictionary in the Client
class (in one of the cgi tests) which made a later test in
test_liveserver fail

Author: schlatterbeck

test/test_cgi.py

@@ -12,6 +12,7 @@
 import unittest, os, shutil, errno, sys, difflib, cgi, re, io
 
 import pytest
+import copy
 
 from roundup.cgi import client, actions, exceptions
 from roundup.cgi.exceptions import FormError, NotFound, Redirect
@@ -1084,7 +1085,6 @@ def hasPermission(s, p, classname=None, d=None, e=None, **kw):
         del(out[0])
         cl.db.config['WEB_CSRF_ENFORCE_TOKEN'] = 'yes'
 
-        import copy
         form2 = copy.copy(form)
         form2.update({'@csrf': 'booogus'})
         # add a bogus csrf field to the form and rerun the inner_main
@@ -1763,6 +1763,8 @@ def testRegisterActionUnusedUserCheck(self):
     def testserve_static_files(self):
         # make a client instance
         cl = self._make_client({})
+        # Make local copy in cl to not modify value in class
+        cl.Cache_Control = copy.copy (cl.Cache_Control)
 
         # hijack _serve_file so I can see what is found
         output = []

test/test_liveserver.py

@@ -1001,7 +1001,6 @@ def test_compression_zstd(self):
                                f.headers.items() if key in expected },
                              expected)
 
-    @pytest.mark.xfail(reason="Fails with 3600 age on circle ci not sure why")
     def test_cache_control_css(self):
         f = requests.get(self.url_base() + '/@@file/style.css',
                              headers = {'content-type': "",