iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tests for func to move VHDs to output dir when skip_export: true

This commit is contained in:
DanHam 2018-07-08 17:12:51 +01:00
parent 32148168bd
commit 0a4ec13323
No known key found for this signature in database
GPG Key ID: 58E79AEDD6AA987E
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builder/hyperv/common/driver_mock.go
View File

@ -190,6 +190,11 @@ type DriverMock struct {
PreserveLegacyExportBehaviour_DstPath string PreserveLegacyExportBehaviour_DstPath string
PreserveLegacyExportBehaviour_Err error PreserveLegacyExportBehaviour_Err error
MoveCreatedVHDsToOutputDir_Called bool
MoveCreatedVHDsToOutputDir_SrcPath string
MoveCreatedVHDsToOutputDir_DstPath string
MoveCreatedVHDsToOutputDir_Err error
CompactDisks_Called bool CompactDisks_Called bool
CompactDisks_Path string CompactDisks_Path string
CompactDisks_Result string CompactDisks_Result string
@ -492,6 +497,13 @@ func (d *DriverMock) PreserveLegacyExportBehaviour(srcPath string, dstPath strin
return d.PreserveLegacyExportBehaviour_Err return d.PreserveLegacyExportBehaviour_Err
} }
func (d *DriverMock) MoveCreatedVHDsToOutputDir(srcPath string, dstPath string) error {
d.MoveCreatedVHDsToOutputDir_Called = true
d.MoveCreatedVHDsToOutputDir_SrcPath = srcPath
d.MoveCreatedVHDsToOutputDir_DstPath = dstPath
return d.MoveCreatedVHDsToOutputDir_Err
}
func (d *DriverMock) CompactDisks(path string) (result string, err error) { func (d *DriverMock) CompactDisks(path string) (result string, err error) {
d.CompactDisks_Called = true d.CompactDisks_Called = true
d.CompactDisks_Path = path d.CompactDisks_Path = path

32
builder/hyperv/common/step_collate_artifacts_test.go
View File

@ -46,18 +46,20 @@ func TestStepCollateArtifacts_exportedArtifacts(t *testing.T) {
driver.PreserveLegacyExportBehaviour_DstPath, step.OutputDir) driver.PreserveLegacyExportBehaviour_DstPath, step.OutputDir)
} }
// TODO: Create MoveCreatedVHDsToOutput func etc // Should only be called when skip_export is true
// if driver.MoveCreatedVHDsToOutput_Called { if driver.MoveCreatedVHDsToOutputDir_Called {
// t.Fatal("Should NOT have called MoveCreatedVHDsToOutput") t.Fatal("Should NOT have called MoveCreatedVHDsToOutputDir")
// } }
} }
func TestStepCollateArtifacts_skipExportedArtifacts(t *testing.T) { func TestStepCollateArtifacts_skipExportArtifacts(t *testing.T) {
state := testState(t) state := testState(t)
step := new(StepCollateArtifacts) step := new(StepCollateArtifacts)
// TODO: Needs the path to the main output directory // Needs the path to the main output directory and build directory
// outputDir := "foopath" step.OutputDir = "foopath"
packerTempDir := "fooBuildPath"
state.Put("packerTempDir", packerTempDir)
// Export has been skipped // Export has been skipped
step.SkipExport = true step.SkipExport = true
@ -71,10 +73,18 @@ func TestStepCollateArtifacts_skipExportedArtifacts(t *testing.T) {
t.Fatal("Should NOT have error") t.Fatal("Should NOT have error")
} }
// TODO: Create MoveCreatedVHDsToOutput func etc // Test the driver
// if !driver.MoveCreatedVHDsToOutput_Called { if !driver.MoveCreatedVHDsToOutputDir_Called {
// t.Fatal("Should have called MoveCreatedVHDsToOutput") t.Fatal("Should have called MoveCreatedVHDsToOutputDir")
// } }
if driver.MoveCreatedVHDsToOutputDir_SrcPath != packerTempDir {
t.Fatalf("Should call with correct srcPath. Got: %s Wanted: %s",
driver.MoveCreatedVHDsToOutputDir_SrcPath, packerTempDir)
}
if driver.MoveCreatedVHDsToOutputDir_DstPath != step.OutputDir {
t.Fatalf("Should call with correct dstPath. Got: %s Wanted: %s",
driver.MoveCreatedVHDsToOutputDir_DstPath, step.OutputDir)
}
if driver.PreserveLegacyExportBehaviour_Called { if driver.PreserveLegacyExportBehaviour_Called {
t.Fatal("Should NOT have called PreserveLegacyExportBehaviour") t.Fatal("Should NOT have called PreserveLegacyExportBehaviour")