Signed-off-by: John Howard <jhoward@microsoft.com>
| ... | ... |
@@ -702,66 +702,3 @@ func TestRegisterExistingLayer(t *testing.T) {
|
| 702 | 702 |
|
| 703 | 703 |
assertReferences(t, layer2a, layer2b) |
| 704 | 704 |
} |
| 705 |
- |
|
| 706 |
-func graphDiffSize(ls Store, l Layer) (int64, error) {
|
|
| 707 |
- cl := getCachedLayer(l) |
|
| 708 |
- var parent string |
|
| 709 |
- if cl.parent != nil {
|
|
| 710 |
- parent = cl.parent.cacheID |
|
| 711 |
- } |
|
| 712 |
- return ls.(*layerStore).driver.DiffSize(cl.cacheID, parent) |
|
| 713 |
-} |
|
| 714 |
- |
|
| 715 |
-func TestLayerSize(t *testing.T) {
|
|
| 716 |
- ls, cleanup := newTestStore(t) |
|
| 717 |
- defer cleanup() |
|
| 718 |
- |
|
| 719 |
- content1 := []byte("Base contents")
|
|
| 720 |
- content2 := []byte("Added contents")
|
|
| 721 |
- |
|
| 722 |
- layer1, err := createLayer(ls, "", initWithFiles(newTestFile("file1", content1, 0644)))
|
|
| 723 |
- if err != nil {
|
|
| 724 |
- t.Fatal(err) |
|
| 725 |
- } |
|
| 726 |
- |
|
| 727 |
- layer2, err := createLayer(ls, layer1.ChainID(), initWithFiles(newTestFile("file2", content2, 0644)))
|
|
| 728 |
- if err != nil {
|
|
| 729 |
- t.Fatal(err) |
|
| 730 |
- } |
|
| 731 |
- |
|
| 732 |
- layer1DiffSize, err := graphDiffSize(ls, layer1) |
|
| 733 |
- if err != nil {
|
|
| 734 |
- t.Fatal(err) |
|
| 735 |
- } |
|
| 736 |
- |
|
| 737 |
- if int(layer1DiffSize) != len(content1) {
|
|
| 738 |
- t.Fatalf("Unexpected diff size %d, expected %d", layer1DiffSize, len(content1))
|
|
| 739 |
- } |
|
| 740 |
- |
|
| 741 |
- layer1Size, err := layer1.Size() |
|
| 742 |
- if err != nil {
|
|
| 743 |
- t.Fatal(err) |
|
| 744 |
- } |
|
| 745 |
- |
|
| 746 |
- if expected := len(content1); int(layer1Size) != expected {
|
|
| 747 |
- t.Fatalf("Unexpected size %d, expected %d", layer1Size, expected)
|
|
| 748 |
- } |
|
| 749 |
- |
|
| 750 |
- layer2DiffSize, err := graphDiffSize(ls, layer2) |
|
| 751 |
- if err != nil {
|
|
| 752 |
- t.Fatal(err) |
|
| 753 |
- } |
|
| 754 |
- |
|
| 755 |
- if int(layer2DiffSize) != len(content2) {
|
|
| 756 |
- t.Fatalf("Unexpected diff size %d, expected %d", layer2DiffSize, len(content2))
|
|
| 757 |
- } |
|
| 758 |
- |
|
| 759 |
- layer2Size, err := layer2.Size() |
|
| 760 |
- if err != nil {
|
|
| 761 |
- t.Fatal(err) |
|
| 762 |
- } |
|
| 763 |
- |
|
| 764 |
- if expected := len(content1) + len(content2); int(layer2Size) != expected {
|
|
| 765 |
- t.Fatalf("Unexpected size %d, expected %d", layer2Size, expected)
|
|
| 766 |
- } |
|
| 767 |
-} |
| 768 | 705 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,71 @@ |
| 0 |
+// +build !windows |
|
| 1 |
+ |
|
| 2 |
+package layer |
|
| 3 |
+ |
|
| 4 |
+import "testing" |
|
| 5 |
+ |
|
| 6 |
+func graphDiffSize(ls Store, l Layer) (int64, error) {
|
|
| 7 |
+ cl := getCachedLayer(l) |
|
| 8 |
+ var parent string |
|
| 9 |
+ if cl.parent != nil {
|
|
| 10 |
+ parent = cl.parent.cacheID |
|
| 11 |
+ } |
|
| 12 |
+ return ls.(*layerStore).driver.DiffSize(cl.cacheID, parent) |
|
| 13 |
+} |
|
| 14 |
+ |
|
| 15 |
+// Unix as Windows graph driver does not support Changes which is indirectly |
|
| 16 |
+// invoked by calling DiffSize on the driver |
|
| 17 |
+func TestLayerSize(t *testing.T) {
|
|
| 18 |
+ ls, cleanup := newTestStore(t) |
|
| 19 |
+ defer cleanup() |
|
| 20 |
+ |
|
| 21 |
+ content1 := []byte("Base contents")
|
|
| 22 |
+ content2 := []byte("Added contents")
|
|
| 23 |
+ |
|
| 24 |
+ layer1, err := createLayer(ls, "", initWithFiles(newTestFile("file1", content1, 0644)))
|
|
| 25 |
+ if err != nil {
|
|
| 26 |
+ t.Fatal(err) |
|
| 27 |
+ } |
|
| 28 |
+ |
|
| 29 |
+ layer2, err := createLayer(ls, layer1.ChainID(), initWithFiles(newTestFile("file2", content2, 0644)))
|
|
| 30 |
+ if err != nil {
|
|
| 31 |
+ t.Fatal(err) |
|
| 32 |
+ } |
|
| 33 |
+ |
|
| 34 |
+ layer1DiffSize, err := graphDiffSize(ls, layer1) |
|
| 35 |
+ if err != nil {
|
|
| 36 |
+ t.Fatal(err) |
|
| 37 |
+ } |
|
| 38 |
+ |
|
| 39 |
+ if int(layer1DiffSize) != len(content1) {
|
|
| 40 |
+ t.Fatalf("Unexpected diff size %d, expected %d", layer1DiffSize, len(content1))
|
|
| 41 |
+ } |
|
| 42 |
+ |
|
| 43 |
+ layer1Size, err := layer1.Size() |
|
| 44 |
+ if err != nil {
|
|
| 45 |
+ t.Fatal(err) |
|
| 46 |
+ } |
|
| 47 |
+ |
|
| 48 |
+ if expected := len(content1); int(layer1Size) != expected {
|
|
| 49 |
+ t.Fatalf("Unexpected size %d, expected %d", layer1Size, expected)
|
|
| 50 |
+ } |
|
| 51 |
+ |
|
| 52 |
+ layer2DiffSize, err := graphDiffSize(ls, layer2) |
|
| 53 |
+ if err != nil {
|
|
| 54 |
+ t.Fatal(err) |
|
| 55 |
+ } |
|
| 56 |
+ |
|
| 57 |
+ if int(layer2DiffSize) != len(content2) {
|
|
| 58 |
+ t.Fatalf("Unexpected diff size %d, expected %d", layer2DiffSize, len(content2))
|
|
| 59 |
+ } |
|
| 60 |
+ |
|
| 61 |
+ layer2Size, err := layer2.Size() |
|
| 62 |
+ if err != nil {
|
|
| 63 |
+ t.Fatal(err) |
|
| 64 |
+ } |
|
| 65 |
+ |
|
| 66 |
+ if expected := len(content1) + len(content2); int(layer2Size) != expected {
|
|
| 67 |
+ t.Fatalf("Unexpected size %d, expected %d", layer2Size, expected)
|
|
| 68 |
+ } |
|
| 69 |
+ |
|
| 70 |
+} |