Skip to content

Commit b224bfa

Browse files
angelcerveraroldanangelcerveraroldan
committed
*/translate_test: Do not pre-compute compressed data
The exact byte output of compressing functions may not be stable across different versions, so hard coding the expected byte output of the compression function will make tests fail or pass depending on the version of Go used to run the test.
1 parent 5ef0f54 commit b224bfa

11 files changed

Lines changed: 282 additions & 194 deletions

File tree

‎base/v0_2/translate_test.go‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ func init() {
5656
// TestTranslateFile tests translating the ct storage.files.[i] entries to ignition storage.files.[i] entries.
5757
func TestTranslateFile(t *testing.T) {
5858
zzz := "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
59-
zzz_gz := "data:;base64,H4sIAAAAAAAC/6oajAAQAAD//5tA8d+VAAAA"
59+
zzzURI, zzzCompression := baseutil.CompressDataURL(t, []byte(zzz))
6060
random := "\xc0\x9cl\x01\x89i\xa5\xbfW\xe4\x1b\xf4J_\xb79P\xa3#\xa7"
61-
random_b64 := "data:;base64,wJxsAYlppb9X5Bv0Sl+3OVCjI6c="
61+
randomURI, randomCompression := baseutil.CompressDataURL(t, []byte(random))
6262

6363
filesDir := t.TempDir()
6464
fileContents := map[string]string{
@@ -477,21 +477,21 @@ func TestTranslateFile(t *testing.T) {
477477
},
478478
FileEmbedded1: types.FileEmbedded1{
479479
Contents: types.Resource{
480-
Source: util.StrToPtr(zzz_gz),
481-
Compression: util.StrToPtr("gzip"),
480+
Source: util.StrToPtr(zzzURI),
481+
Compression: util.StrToPtr(zzzCompression),
482482
},
483483
Append: []types.Resource{
484484
{
485-
Source: util.StrToPtr(zzz_gz),
486-
Compression: util.StrToPtr("gzip"),
485+
Source: util.StrToPtr(zzzURI),
486+
Compression: util.StrToPtr(zzzCompression),
487487
},
488488
{
489-
Source: util.StrToPtr(random_b64),
490-
Compression: util.StrToPtr(""),
489+
Source: util.StrToPtr(randomURI),
490+
Compression: util.StrToPtr(randomCompression),
491491
},
492492
{
493-
Source: util.StrToPtr(random_b64),
494-
Compression: util.StrToPtr(""),
493+
Source: util.StrToPtr(randomURI),
494+
Compression: util.StrToPtr(randomCompression),
495495
},
496496
{
497497
Source: util.StrToPtr("data:," + zzz),
@@ -962,6 +962,9 @@ RequiredBy=local-fs.target`),
962962

963963
// TestTranslateTree tests translating the butane storage.trees.[i] entries to ignition storage.files.[i] entries.
964964
func TestTranslateTree(t *testing.T) {
965+
deepPath := "tree/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/file"
966+
deepPathURI, deepPathCompression := baseutil.CompressDataURL(t, []byte(deepPath))
967+
965968
tests := []struct {
966969
options *common.TranslateOptions // defaulted if not specified
967970
dirDirs map[string]os.FileMode // relative path -> mode
@@ -1109,8 +1112,8 @@ func TestTranslateTree(t *testing.T) {
11091112
},
11101113
FileEmbedded1: types.FileEmbedded1{
11111114
Contents: types.Resource{
1112-
Source: util.StrToPtr("data:;base64,H4sIAAAAAAAC/yopSk3VLy5NSsksIptKy8xJBQQAAP//gkRzjkgAAAA="),
1113-
Compression: util.StrToPtr("gzip"),
1115+
Source: util.StrToPtr(deepPathURI),
1116+
Compression: util.StrToPtr(deepPathCompression),
11141117
},
11151118
Mode: util.IntToPtr(0644),
11161119
},

‎base/v0_3/translate_test.go‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ func init() {
5656
// TestTranslateFile tests translating the ct storage.files.[i] entries to ignition storage.files.[i] entries.
5757
func TestTranslateFile(t *testing.T) {
5858
zzz := "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
59-
zzz_gz := "data:;base64,H4sIAAAAAAAC/6oajAAQAAD//5tA8d+VAAAA"
59+
zzzURI, zzzCompression := baseutil.CompressDataURL(t, []byte(zzz))
6060
random := "\xc0\x9cl\x01\x89i\xa5\xbfW\xe4\x1b\xf4J_\xb79P\xa3#\xa7"
61-
random_b64 := "data:;base64,wJxsAYlppb9X5Bv0Sl+3OVCjI6c="
61+
randomURI, randomCompression := baseutil.CompressDataURL(t, []byte(random))
6262

6363
filesDir := t.TempDir()
6464
fileContents := map[string]string{
@@ -477,21 +477,21 @@ func TestTranslateFile(t *testing.T) {
477477
},
478478
FileEmbedded1: types.FileEmbedded1{
479479
Contents: types.Resource{
480-
Source: util.StrToPtr(zzz_gz),
481-
Compression: util.StrToPtr("gzip"),
480+
Source: util.StrToPtr(zzzURI),
481+
Compression: util.StrToPtr(zzzCompression),
482482
},
483483
Append: []types.Resource{
484484
{
485-
Source: util.StrToPtr(zzz_gz),
486-
Compression: util.StrToPtr("gzip"),
485+
Source: util.StrToPtr(zzzURI),
486+
Compression: util.StrToPtr(zzzCompression),
487487
},
488488
{
489-
Source: util.StrToPtr(random_b64),
490-
Compression: util.StrToPtr(""),
489+
Source: util.StrToPtr(randomURI),
490+
Compression: util.StrToPtr(randomCompression),
491491
},
492492
{
493-
Source: util.StrToPtr(random_b64),
494-
Compression: util.StrToPtr(""),
493+
Source: util.StrToPtr(randomURI),
494+
Compression: util.StrToPtr(randomCompression),
495495
},
496496
{
497497
Source: util.StrToPtr("data:," + zzz),
@@ -1116,6 +1116,9 @@ RequiredBy=remote-fs.target`),
11161116

11171117
// TestTranslateTree tests translating the butane storage.trees.[i] entries to ignition storage.files.[i] entries.
11181118
func TestTranslateTree(t *testing.T) {
1119+
deepPath := "tree/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/file"
1120+
deepPathURI, deepPathCompression := baseutil.CompressDataURL(t, []byte(deepPath))
1121+
11191122
tests := []struct {
11201123
options *common.TranslateOptions // defaulted if not specified
11211124
dirDirs map[string]os.FileMode // relative path -> mode
@@ -1263,8 +1266,8 @@ func TestTranslateTree(t *testing.T) {
12631266
},
12641267
FileEmbedded1: types.FileEmbedded1{
12651268
Contents: types.Resource{
1266-
Source: util.StrToPtr("data:;base64,H4sIAAAAAAAC/yopSk3VLy5NSsksIptKy8xJBQQAAP//gkRzjkgAAAA="),
1267-
Compression: util.StrToPtr("gzip"),
1269+
Source: util.StrToPtr(deepPathURI),
1270+
Compression: util.StrToPtr(deepPathCompression),
12681271
},
12691272
Mode: util.IntToPtr(0644),
12701273
},

‎base/v0_4/translate_test.go‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ func init() {
5656
// TestTranslateFile tests translating the ct storage.files.[i] entries to ignition storage.files.[i] entries.
5757
func TestTranslateFile(t *testing.T) {
5858
zzz := "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
59-
zzz_gz := "data:;base64,H4sIAAAAAAAC/6oajAAQAAD//5tA8d+VAAAA"
59+
zzzURI, zzzCompression := baseutil.CompressDataURL(t, []byte(zzz))
6060
random := "\xc0\x9cl\x01\x89i\xa5\xbfW\xe4\x1b\xf4J_\xb79P\xa3#\xa7"
61-
random_b64 := "data:;base64,wJxsAYlppb9X5Bv0Sl+3OVCjI6c="
61+
randomURI, randomCompression := baseutil.CompressDataURL(t, []byte(random))
6262

6363
filesDir := t.TempDir()
6464
fileContents := map[string]string{
@@ -477,21 +477,21 @@ func TestTranslateFile(t *testing.T) {
477477
},
478478
FileEmbedded1: types.FileEmbedded1{
479479
Contents: types.Resource{
480-
Source: util.StrToPtr(zzz_gz),
481-
Compression: util.StrToPtr("gzip"),
480+
Source: util.StrToPtr(zzzURI),
481+
Compression: util.StrToPtr(zzzCompression),
482482
},
483483
Append: []types.Resource{
484484
{
485-
Source: util.StrToPtr(zzz_gz),
486-
Compression: util.StrToPtr("gzip"),
485+
Source: util.StrToPtr(zzzURI),
486+
Compression: util.StrToPtr(zzzCompression),
487487
},
488488
{
489-
Source: util.StrToPtr(random_b64),
490-
Compression: util.StrToPtr(""),
489+
Source: util.StrToPtr(randomURI),
490+
Compression: util.StrToPtr(randomCompression),
491491
},
492492
{
493-
Source: util.StrToPtr(random_b64),
494-
Compression: util.StrToPtr(""),
493+
Source: util.StrToPtr(randomURI),
494+
Compression: util.StrToPtr(randomCompression),
495495
},
496496
{
497497
Source: util.StrToPtr("data:," + zzz),
@@ -1201,6 +1201,9 @@ RequiredBy=swap.target`),
12011201

12021202
// TestTranslateTree tests translating the butane storage.trees.[i] entries to ignition storage.files.[i] entries.
12031203
func TestTranslateTree(t *testing.T) {
1204+
deepPath := "tree/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/file"
1205+
deepPathURI, deepPathCompression := baseutil.CompressDataURL(t, []byte(deepPath))
1206+
12041207
tests := []struct {
12051208
options *common.TranslateOptions // defaulted if not specified
12061209
dirDirs map[string]os.FileMode // relative path -> mode
@@ -1348,8 +1351,8 @@ func TestTranslateTree(t *testing.T) {
13481351
},
13491352
FileEmbedded1: types.FileEmbedded1{
13501353
Contents: types.Resource{
1351-
Source: util.StrToPtr("data:;base64,H4sIAAAAAAAC/yopSk3VLy5NSsksIptKy8xJBQQAAP//gkRzjkgAAAA="),
1352-
Compression: util.StrToPtr("gzip"),
1354+
Source: util.StrToPtr(deepPathURI),
1355+
Compression: util.StrToPtr(deepPathCompression),
13531356
},
13541357
Mode: util.IntToPtr(0644),
13551358
},

‎base/v0_5/translate_test.go‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ func init() {
5656
// TestTranslateFile tests translating the ct storage.files.[i] entries to ignition storage.files.[i] entries.
5757
func TestTranslateFile(t *testing.T) {
5858
zzz := "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
59-
zzz_gz := "data:;base64,H4sIAAAAAAAC/6oajAAQAAD//5tA8d+VAAAA"
59+
zzzURI, zzzCompression := baseutil.CompressDataURL(t, []byte(zzz))
6060
random := "\xc0\x9cl\x01\x89i\xa5\xbfW\xe4\x1b\xf4J_\xb79P\xa3#\xa7"
61-
random_b64 := "data:;base64,wJxsAYlppb9X5Bv0Sl+3OVCjI6c="
61+
randomURI, randomCompression := baseutil.CompressDataURL(t, []byte(random))
6262

6363
filesDir := t.TempDir()
6464
fileContents := map[string]string{
@@ -477,21 +477,21 @@ func TestTranslateFile(t *testing.T) {
477477
},
478478
FileEmbedded1: types.FileEmbedded1{
479479
Contents: types.Resource{
480-
Source: util.StrToPtr(zzz_gz),
481-
Compression: util.StrToPtr("gzip"),
480+
Source: util.StrToPtr(zzzURI),
481+
Compression: util.StrToPtr(zzzCompression),
482482
},
483483
Append: []types.Resource{
484484
{
485-
Source: util.StrToPtr(zzz_gz),
486-
Compression: util.StrToPtr("gzip"),
485+
Source: util.StrToPtr(zzzURI),
486+
Compression: util.StrToPtr(zzzCompression),
487487
},
488488
{
489-
Source: util.StrToPtr(random_b64),
490-
Compression: util.StrToPtr(""),
489+
Source: util.StrToPtr(randomURI),
490+
Compression: util.StrToPtr(randomCompression),
491491
},
492492
{
493-
Source: util.StrToPtr(random_b64),
494-
Compression: util.StrToPtr(""),
493+
Source: util.StrToPtr(randomURI),
494+
Compression: util.StrToPtr(randomCompression),
495495
},
496496
{
497497
Source: util.StrToPtr("data:," + zzz),
@@ -1201,6 +1201,9 @@ RequiredBy=swap.target`),
12011201

12021202
// TestTranslateTree tests translating the butane storage.trees.[i] entries to ignition storage.files.[i] entries.
12031203
func TestTranslateTree(t *testing.T) {
1204+
deepPath := "tree/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/file"
1205+
deepPathURI, deepPathCompression := baseutil.CompressDataURL(t, []byte(deepPath))
1206+
12041207
tests := []struct {
12051208
options *common.TranslateOptions // defaulted if not specified
12061209
dirDirs map[string]os.FileMode // relative path -> mode
@@ -1348,8 +1351,8 @@ func TestTranslateTree(t *testing.T) {
13481351
},
13491352
FileEmbedded1: types.FileEmbedded1{
13501353
Contents: types.Resource{
1351-
Source: util.StrToPtr("data:;base64,H4sIAAAAAAAC/yopSk3VLy5NSsksIptKy8xJBQQAAP//gkRzjkgAAAA="),
1352-
Compression: util.StrToPtr("gzip"),
1354+
Source: util.StrToPtr(deepPathURI),
1355+
Compression: util.StrToPtr(deepPathCompression),
13531356
},
13541357
Mode: util.IntToPtr(0644),
13551358
},

‎base/v0_6/translate_test.go‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ func init() {
5656
// TestTranslateFile tests translating the ct storage.files.[i] entries to ignition storage.files.[i] entries.
5757
func TestTranslateFile(t *testing.T) {
5858
zzz := "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
59-
zzz_gz := "data:;base64,H4sIAAAAAAAC/6oajAAQAAD//5tA8d+VAAAA"
59+
zzzURI, zzzCompression := baseutil.CompressDataURL(t, []byte(zzz))
6060
random := "\xc0\x9cl\x01\x89i\xa5\xbfW\xe4\x1b\xf4J_\xb79P\xa3#\xa7"
61-
random_b64 := "data:;base64,wJxsAYlppb9X5Bv0Sl+3OVCjI6c="
61+
randomURI, randomCompression := baseutil.CompressDataURL(t, []byte(random))
6262

6363
filesDir := t.TempDir()
6464
fileContents := map[string]string{
@@ -477,21 +477,21 @@ func TestTranslateFile(t *testing.T) {
477477
},
478478
FileEmbedded1: types.FileEmbedded1{
479479
Contents: types.Resource{
480-
Source: util.StrToPtr(zzz_gz),
481-
Compression: util.StrToPtr("gzip"),
480+
Source: util.StrToPtr(zzzURI),
481+
Compression: util.StrToPtr(zzzCompression),
482482
},
483483
Append: []types.Resource{
484484
{
485-
Source: util.StrToPtr(zzz_gz),
486-
Compression: util.StrToPtr("gzip"),
485+
Source: util.StrToPtr(zzzURI),
486+
Compression: util.StrToPtr(zzzCompression),
487487
},
488488
{
489-
Source: util.StrToPtr(random_b64),
490-
Compression: util.StrToPtr(""),
489+
Source: util.StrToPtr(randomURI),
490+
Compression: util.StrToPtr(randomCompression),
491491
},
492492
{
493-
Source: util.StrToPtr(random_b64),
494-
Compression: util.StrToPtr(""),
493+
Source: util.StrToPtr(randomURI),
494+
Compression: util.StrToPtr(randomCompression),
495495
},
496496
{
497497
Source: util.StrToPtr("data:," + zzz),
@@ -1201,6 +1201,9 @@ RequiredBy=swap.target`),
12011201

12021202
// TestTranslateTree tests translating the butane storage.trees.[i] entries to ignition storage.files.[i] entries.
12031203
func TestTranslateTree(t *testing.T) {
1204+
deepPath := "tree/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/file"
1205+
deepPathURI, deepPathCompression := baseutil.CompressDataURL(t, []byte(deepPath))
1206+
12041207
tests := []struct {
12051208
options *common.TranslateOptions // defaulted if not specified
12061209
dirDirs map[string]os.FileMode // relative path -> mode
@@ -1348,8 +1351,8 @@ func TestTranslateTree(t *testing.T) {
13481351
},
13491352
FileEmbedded1: types.FileEmbedded1{
13501353
Contents: types.Resource{
1351-
Source: util.StrToPtr("data:;base64,H4sIAAAAAAAC/yopSk3VLy5NSsksIptKy8xJBQQAAP//gkRzjkgAAAA="),
1352-
Compression: util.StrToPtr("gzip"),
1354+
Source: util.StrToPtr(deepPathURI),
1355+
Compression: util.StrToPtr(deepPathCompression),
13531356
},
13541357
Mode: util.IntToPtr(0644),
13551358
},

‎base/v0_7/translate_test.go‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ func init() {
5656
// TestTranslateFile tests translating the ct storage.files.[i] entries to ignition storage.files.[i] entries.
5757
func TestTranslateFile(t *testing.T) {
5858
zzz := "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
59-
zzz_gz := "data:;base64,H4sIAAAAAAAC/6oajAAQAAD//5tA8d+VAAAA"
59+
zzzURI, zzzCompression := baseutil.CompressDataURL(t, []byte(zzz))
6060
random := "\xc0\x9cl\x01\x89i\xa5\xbfW\xe4\x1b\xf4J_\xb79P\xa3#\xa7"
61-
random_b64 := "data:;base64,wJxsAYlppb9X5Bv0Sl+3OVCjI6c="
61+
randomURI, randomCompression := baseutil.CompressDataURL(t, []byte(random))
6262

6363
filesDir := t.TempDir()
6464
fileContents := map[string]string{
@@ -477,21 +477,21 @@ func TestTranslateFile(t *testing.T) {
477477
},
478478
FileEmbedded1: types.FileEmbedded1{
479479
Contents: types.Resource{
480-
Source: util.StrToPtr(zzz_gz),
481-
Compression: util.StrToPtr("gzip"),
480+
Source: util.StrToPtr(zzzURI),
481+
Compression: util.StrToPtr(zzzCompression),
482482
},
483483
Append: []types.Resource{
484484
{
485-
Source: util.StrToPtr(zzz_gz),
486-
Compression: util.StrToPtr("gzip"),
485+
Source: util.StrToPtr(zzzURI),
486+
Compression: util.StrToPtr(zzzCompression),
487487
},
488488
{
489-
Source: util.StrToPtr(random_b64),
490-
Compression: util.StrToPtr(""),
489+
Source: util.StrToPtr(randomURI),
490+
Compression: util.StrToPtr(randomCompression),
491491
},
492492
{
493-
Source: util.StrToPtr(random_b64),
494-
Compression: util.StrToPtr(""),
493+
Source: util.StrToPtr(randomURI),
494+
Compression: util.StrToPtr(randomCompression),
495495
},
496496
{
497497
Source: util.StrToPtr("data:," + zzz),
@@ -1201,6 +1201,9 @@ RequiredBy=swap.target`),
12011201

12021202
// TestTranslateTree tests translating the butane storage.trees.[i] entries to ignition storage.files.[i] entries.
12031203
func TestTranslateTree(t *testing.T) {
1204+
deepPath := "tree/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/subdir/file"
1205+
deepPathURI, deepPathCompression := baseutil.CompressDataURL(t, []byte(deepPath))
1206+
12041207
tests := []struct {
12051208
options *common.TranslateOptions // defaulted if not specified
12061209
dirDirs map[string]os.FileMode // relative path -> mode
@@ -1349,8 +1352,8 @@ func TestTranslateTree(t *testing.T) {
13491352
},
13501353
FileEmbedded1: types.FileEmbedded1{
13511354
Contents: types.Resource{
1352-
Source: util.StrToPtr("data:;base64,H4sIAAAAAAAC/yopSk3VLy5NSsksIptKy8xJBQQAAP//gkRzjkgAAAA="),
1353-
Compression: util.StrToPtr("gzip"),
1355+
Source: util.StrToPtr(deepPathURI),
1356+
Compression: util.StrToPtr(deepPathCompression),
13541357
},
13551358
Mode: util.IntToPtr(0644),
13561359
},

0 commit comments

Comments
 (0)