Merge pull request #7 from uw-it-aca/bug/mock-stable-hash

stable hash for mock references, license date
uw-it-aca · Feb 15, 2022 · fde8f71 · fde8f71
2 parents cdfc22e + 8e737fe
commit fde8f71
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 25 deletions.
diff --git a/panopto_client/__init__.py b/panopto_client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/panopto_client/access.py b/panopto_client/access.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/panopto_client/mock_data/__init__.py b/panopto_client/mock_data/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """
@@ -10,6 +10,7 @@
 import sys
 import os
 import re
+import json
 from os.path import abspath, dirname
 
 
@@ -82,18 +83,15 @@ def _load_mock_resource_from_path(self, resource_dir, resource_path):
  return mock_data
 
  def _mock_file_path(self, portName, methodName, params):
- return os.path.join(portName, methodName, md5(
- self._normalize(params).encode('utf-8')).hexdigest().upper())
+ return os.path.join(portName, methodName, self._param_hash(params))
 
- def _normalize(self, params):
- ignored = ['auth']
- normalized = {}
+ def _normalized(self, params):
+ excluded = {'auth'}
+ return {k: params[k] for k in params if k not in excluded}
 
- for k in sorted(params.keys()):
- if k not in ignored:
- normalized[k] = params[k]
-
- return str(normalized)
+ def _param_hash(self, params):
+ h = md5(json.dumps(self._normalized(params), sort_keys=True).encode())
+ return h.hexdigest().upper()
 
  def convert_to_platform_safe(self, dir_file_name):
  """

diff --git a/panopto_client/remote_recorder.py b/panopto_client/remote_recorder.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/panopto_client/session.py b/panopto_client/session.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/panopto_client/test.py b/panopto_client/test.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 # This is just a test runner for coverage

diff --git a/panopto_client/tests/__init__.py b/panopto_client/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/panopto_client/tests/test_access.py b/panopto_client/tests/test_access.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/panopto_client/tests/test_client.py b/panopto_client/tests/test_client.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/panopto_client/tests/test_remote_recorder.py b/panopto_client/tests/test_remote_recorder.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/panopto_client/tests/test_session.py b/panopto_client/tests/test_session.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/panopto_client/tests/test_usage.py b/panopto_client/tests/test_usage.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/panopto_client/tests/test_user.py b/panopto_client/tests/test_user.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/panopto_client/usage.py b/panopto_client/usage.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/panopto_client/user.py b/panopto_client/user.py
@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2022 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """