From a57851aa6e7169a240a6dbaff18c09a754b5286f Mon Sep 17 00:00:00 2001
From: Jay <jlaura@usgs.gov>
Date: Mon, 7 May 2018 11:52:09 -0700
Subject: [PATCH] Fixes MRO serial issue
---
plio/data/data.db | Bin 57344 -> 57344 bytes
plio/io/isis_serial_number.py | 1 +
plio/io/tests/test_isis_serial_numbers.py | 25 ++++++++++++++--------
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/plio/data/data.db b/plio/data/data.db
index c1ac0e7c5802a4222a93a6ab400dc3dbc454aeb0..09fc46d99adf6d88099df74c72033a853cc3e8eb 100644
GIT binary patch
delta 109
zcmV-z0FwWJzypB51CSd54Urr}5e)z?5c>@P00064j{pNh0*|vX%pU@?j{<X<3jP2B
z051Rm82~SlaU+v2oX-RR000}2K^G5&WF-aw6BCO)ZE|lzba<07T;G%Iog=eDu>%2<
PFlh>t-`&Ww|DORsTT3EQ
delta 105
zcmV-v0G9uNzypB51CSd536UH_5eWb-@wg2D00064j{pNh0*|vX%pU@?j{<X<3IG5C
z051Rl{s1qLaU+v2oX-!1e<cP06BCPbZE|lzba<07T;G!io+FcYVH2}ZC<_6TFlh>t
L-`&Ww|DORsMTR0f
diff --git a/plio/io/isis_serial_number.py b/plio/io/isis_serial_number.py
index 0c187ab..01f8fb7 100644
--- a/plio/io/isis_serial_number.py
+++ b/plio/io/isis_serial_number.py
@@ -82,6 +82,7 @@ def generate_serial_number(label):
# Sort the keys to ensure proper iteration order
keys = sorted(translation.keys())
+
for k in keys:
try:
group = translation[k]
diff --git a/plio/io/tests/test_isis_serial_numbers.py b/plio/io/tests/test_isis_serial_numbers.py
index 8abf322..2cd6890 100644
--- a/plio/io/tests/test_isis_serial_numbers.py
+++ b/plio/io/tests/test_isis_serial_numbers.py
@@ -1,17 +1,24 @@
import os
import sys
-import unittest
-from plio.examples import get_path
-
-sys.path.insert(0, os.path.abspath('..'))
+import pytest
from plio.io import isis_serial_number
+from plio.examples import get_path
+
+@pytest.fixture
+def apollo_lbl():
+ return get_path('Test_PVL.lbl')
+@pytest.fixture
+def ctx_lbl():
+ return get_path('ctx.pvl')
-class TestIsisSerials(unittest.TestCase):
+@pytest.mark.parametrize("label, expected", [(apollo_lbl(), 'APOLLO15/METRIC/1971-07-31T14:02:27.179'),
+ (ctx_lbl(),'MRO/CTX/0906095311:038')
+ ])
+def test_generate_serial_number(label, expected):
+ serial = isis_serial_number.generate_serial_number(label)
+ assert serial == expected
- def test_generate_serial_number(self):
- label = get_path('Test_PVL.lbl')
- serial = isis_serial_number.generate_serial_number(label)
- self.assertEqual('APOLLO15/METRIC/1971-07-31T14:02:27.179', serial)
\ No newline at end of file
+
\ No newline at end of file
--
GitLab