Skip to content

Commit a46c074

Browse files
❤️ TEST-#104: Fix S3 tests to match key without .json and overwrite behavior
1 parent 3b0c4a6 commit a46c074

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

tests/providers/test_storage_s3.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ def test_post(self):
3737
expected_value = {"foo": "bar"}
3838

3939
storage = StorageS3(bucket=BUCKET, prefix=PREFIX, region=REGION)
40-
storage.post(key="test.json", context=Context(storage=expected_value))
40+
storage.post(key="test", context=Context(storage=expected_value))
4141

42-
obj = self.conn.get_object(Bucket=BUCKET, Key=f"{PREFIX}test.json")
42+
obj = self.conn.get_object(Bucket=BUCKET, Key=f"{PREFIX}test")
4343
data = loads(obj["Body"].read().decode("utf-8"))
4444

4545
self.assertEqual(loads(data[0]), expected_value)
@@ -58,34 +58,34 @@ def test_post_many(self):
5858
)
5959

6060
storage = StorageS3(bucket=BUCKET, prefix=PREFIX, region=REGION)
61-
storage.post(key="test.json", context=input_value)
61+
storage.post(key="test", context=input_value)
6262

63-
obj = self.conn.get_object(Bucket=BUCKET, Key=f"{PREFIX}test.json")
63+
obj = self.conn.get_object(Bucket=BUCKET, Key=f"{PREFIX}test")
6464
data = loads(obj["Body"].read().decode("utf-8"))
6565

6666
self.assertEqual(loads(data[0]), expected_one)
6767
self.assertEqual(loads(data[1]), expected_two)
6868

6969
@mock_aws
70-
def test_post_with_existing_key(self):
70+
def test_post_overwrites_existing_key(self):
7171
self.conn.create_bucket(Bucket=BUCKET)
72-
expected_one = {"foo": "bar"}
73-
expected_two = True
72+
old_value = {"foo": "bar"}
73+
new_value = {"foo": "baz"}
7474

7575
self.conn.put_object(
7676
Bucket=BUCKET,
77-
Key=f"{PREFIX}test.json",
78-
Body=dumps([dumps(expected_one)]),
77+
Key=f"{PREFIX}test",
78+
Body=dumps([dumps(old_value)]),
7979
)
8080

8181
storage = StorageS3(bucket=BUCKET, prefix=PREFIX, region=REGION)
82-
storage.post(key="test.json", context=Context(storage=expected_two))
82+
storage.post(key="test", context=Context(storage=new_value))
8383

84-
obj = self.conn.get_object(Bucket=BUCKET, Key=f"{PREFIX}test.json")
84+
obj = self.conn.get_object(Bucket=BUCKET, Key=f"{PREFIX}test")
8585
data = loads(obj["Body"].read().decode("utf-8"))
8686

87-
self.assertEqual(loads(data[0]), expected_one)
88-
self.assertEqual(loads(data[1]), expected_two)
87+
self.assertEqual(len(data), 1)
88+
self.assertEqual(loads(data[0]), new_value)
8989

9090
@mock_aws
9191
def test_get(self):
@@ -94,12 +94,12 @@ def test_get(self):
9494

9595
self.conn.put_object(
9696
Bucket=BUCKET,
97-
Key=f"{PREFIX}test.json",
97+
Key=f"{PREFIX}test",
9898
Body=dumps([dumps(expected_value)]),
9999
)
100100

101101
storage = StorageS3(bucket=BUCKET, prefix=PREFIX, region=REGION)
102-
result = storage.get(key="test.json")
102+
result = storage.get(key="test")
103103

104104
self.assertIsInstance(result, Context)
105105
self.assertEqual(result.storage, expected_value)
@@ -112,12 +112,12 @@ def test_get_many(self):
112112

113113
self.conn.put_object(
114114
Bucket=BUCKET,
115-
Key=f"{PREFIX}test.json",
115+
Key=f"{PREFIX}test",
116116
Body=dumps([dumps(expected_one), dumps(expected_two)]),
117117
)
118118

119119
storage = StorageS3(bucket=BUCKET, prefix=PREFIX, region=REGION)
120-
result = storage.get(key="test.json")
120+
result = storage.get(key="test")
121121

122122
self.assertIsInstance(result, Context)
123123
self.assertEqual(result.storage[0].storage, expected_one)
@@ -147,4 +147,4 @@ def test_key(self):
147147
storage = StorageS3(bucket=BUCKET, prefix=PREFIX, region=REGION)
148148
result = storage.key(task=task)
149149

150-
self.assertEqual(result, f"{workflow_id}-0.json")
150+
self.assertEqual(result, f"{workflow_id}-0")

0 commit comments

Comments
 (0)