Fix functional tests to honor MINT_DATA_DIR properly #879
Conversation
harshavardhana
force-pushed
the
fix-functional
branch
from
b8faa4b
to
e0685b4
Compare
harshavardhana
changed the title
harshavardhana
requested review from
ebozduman
and removed request for
kannappanr
functional_tests.go
Outdated
| @@ -6244,7 +6255,7 @@ func testPutObjectWithContextV2() { | |||
| } | |||
| defer c.RemoveBucket(bucketName) | |||
| bufSize := thirtyThreeKiB | |||
There was a problem hiding this comment.
bufSize can also be picked from the map based on filename
harshavardhana
force-pushed
the
fix-functional
branch
2 times, most recently
from
755c181
to
ac44e96
Compare
functional_tests.go
Outdated
| if getDataDir() != "" { | ||
| filepath = getDataDir() + "/" + filename | ||
| func getFilePath(filename string) (fp string) { | ||
| if mintDataDir == "" { |
There was a problem hiding this comment.
Don't we want to return just the file name (filepath here), when mintDataDir is empty, "", i.e when env var MINT_DATA_DIR is not defined?
If true, then having just return filepath.Join(mintDataDir, filename) would be good enough for both cases (when env var is defined and not defined).
There was a problem hiding this comment.
No we are not returning the file name we are only returning if the filepath can be constructed. because this function is meaningless.. outside of mint context
There was a problem hiding this comment.
Changed the function name to avoid confusion.
functional_tests.go
Outdated
| @@ -617,9 +628,9 @@ func testPutObjectWithMetadata() { | |||
| return | |||
| } | |||
|
|
|||
| // Generate data using 2 parts | |||
| // Generate data for using 2 parts | |||
harshavardhana
force-pushed
the
fix-functional
branch
from
ac44e96
to
0d63a4b
Compare
|
@ebozduman please take a look again. |
functional_tests.go
Outdated
| @@ -617,9 +623,10 @@ func testPutObjectWithMetadata() { | |||
| return | |||
| } | |||
|
|
|||
| // Generate data using 2 parts | |||
| // Generate data for using 2 parts | |||
There was a problem hiding this comment.
Comment can be more clear.
harshavardhana
force-pushed
the
fix-functional
branch
from
0d63a4b
to
fb811e5
Compare
|
Removed all unnecessary comments @kannappanr @ebozduman can you review again? |
harshavardhana
force-pushed
the
fix-functional
branch
from
fb811e5
to
a8cc825
Compare
| objectName := fmt.Sprintf("test-file-%v", rand.Uint32()) | ||
| args["objectName"] = objectName | ||
|
|
||
| offset := length / 2 | ||
| if _, err := tempfile.Seek(int64(offset), 0); err != nil { | ||
| if _, err = tempfile.Seek(int64(offset), 0); err != nil { |
There was a problem hiding this comment.
You should not do os.Remove at line 3845
| @@ -1525,11 +1528,6 @@ func testFPutObject() { | |||
| return | |||
| } | |||
|
|
|||
| err = os.Remove(fName + ".gtar") | |||
There was a problem hiding this comment.
This file should be removed. This code is needed, otherwise it will leave an extra file in the /mint/data directory
getDataReader() now doesn't rely on multiple arguments for different behavior, instead getDataReader() always returns a reader depending on the input file name. This map of file name maps to size which correspond with MINT_DATA_DIR requirements. This fixes a whole bunch of bugs in interpretation, repetition in tests.
harshavardhana
force-pushed
the
fix-functional
branch
from
a8cc825
to
ed7e6fd
Compare
getDataReader() now doesn't rely on multiple arguments
for different behavior, instead getDataReader() always
returns a reader depending on the input file name.
This map of file name maps to size which correspond with
MINT_DATA_DIR requirements.
This fixes a whole bunch of bugs in interpretation, repetition
in tests.