mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-07-15 11:57:59 +00:00
Fix go vet issues
- Fix s3/public_test.go: Change s.srv.Stop() to s.srv.Quit() - Fix task/output_test.go: Replace dot import with qualified import to avoid name conflict with task.List struct These fixes allow go vet to pass successfully.
This commit is contained in:
Nick Bozhenko
@@ -47,6 +47,9 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Generate VERSION file
|
||||
run: make version > VERSION || echo "dev" > VERSION
|
||||
|
||||
- name: Run go vet
|
||||
run: go vet ./...
|
||||
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ func (s *PublishedStorageSuite) SetUpTest(c *C) {
|
||||
}
|
||||
|
||||
func (s *PublishedStorageSuite) TearDownTest(c *C) {
|
||||
s.srv.Stop()
|
||||
s.srv.Quit()
|
||||
}
|
||||
|
||||
func (s *PublishedStorageSuite) GetFile(c *C, path string) []byte {
|
||||
|
||||
+112
-112
@@ -6,7 +6,7 @@ import (
|
||||
"sync"
|
||||
|
||||
"github.com/aptly-dev/aptly/aptly"
|
||||
. "gopkg.in/check.v1"
|
||||
check "gopkg.in/check.v1"
|
||||
)
|
||||
|
||||
type OutputSuite struct {
|
||||
@@ -14,11 +14,11 @@ type OutputSuite struct {
|
||||
publishOutput *PublishOutput
|
||||
}
|
||||
|
||||
var _ = Suite(&OutputSuite{})
|
||||
var _ = check.Suite(&OutputSuite{})
|
||||
|
||||
var aptly_BarPublishGeneratePackageFiles_ptr = aptly.BarPublishGeneratePackageFiles
|
||||
|
||||
func (s *OutputSuite) SetUpTest(c *C) {
|
||||
func (s *OutputSuite) SetUpTest(c *check.C) {
|
||||
s.output = NewOutput()
|
||||
s.publishOutput = &PublishOutput{
|
||||
Progress: s.output,
|
||||
@@ -29,25 +29,25 @@ func (s *OutputSuite) SetUpTest(c *C) {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestNewOutput(c *C) {
|
||||
func (s *OutputSuite) TestNewOutput(c *check.C) {
|
||||
// Test creating new output
|
||||
output := NewOutput()
|
||||
c.Check(output, NotNil)
|
||||
c.Check(output.mu, NotNil)
|
||||
c.Check(output.output, NotNil)
|
||||
c.Check(output.String(), Equals, "")
|
||||
c.Check(output, check.NotNil)
|
||||
c.Check(output.mu, check.NotNil)
|
||||
c.Check(output.output, check.NotNil)
|
||||
c.Check(output.String(), check.Equals, "")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputString(c *C) {
|
||||
func (s *OutputSuite) TestOutputString(c *check.C) {
|
||||
// Test String method
|
||||
c.Check(s.output.String(), Equals, "")
|
||||
c.Check(s.output.String(), check.Equals, "")
|
||||
|
||||
// Write some content and test again
|
||||
s.output.WriteString("test content")
|
||||
c.Check(s.output.String(), Equals, "test content")
|
||||
c.Check(s.output.String(), check.Equals, "test content")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputStringConcurrent(c *C) {
|
||||
func (s *OutputSuite) TestOutputStringConcurrent(c *check.C) {
|
||||
// Test String method with concurrent access
|
||||
var wg sync.WaitGroup
|
||||
|
||||
@@ -73,52 +73,52 @@ func (s *OutputSuite) TestOutputStringConcurrent(c *C) {
|
||||
|
||||
// Should contain all the writes
|
||||
result := s.output.String()
|
||||
c.Check(len(result), Equals, 40) // 10 * "test" = 40 chars
|
||||
c.Check(len(result), check.Equals, 40) // 10 * "test" = 40 chars
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputWrite(c *C) {
|
||||
func (s *OutputSuite) TestOutputWrite(c *check.C) {
|
||||
// Test Write method
|
||||
data := []byte("test data")
|
||||
n, err := s.output.Write(data)
|
||||
c.Check(err, IsNil)
|
||||
c.Check(n, Equals, len(data))
|
||||
c.Check(err, check.IsNil)
|
||||
c.Check(n, check.Equals, len(data))
|
||||
|
||||
// Write method doesn't actually write to buffer, just returns length
|
||||
c.Check(s.output.String(), Equals, "")
|
||||
c.Check(s.output.String(), check.Equals, "")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputWriteError(c *C) {
|
||||
func (s *OutputSuite) TestOutputWriteError(c *check.C) {
|
||||
// Test Write method - can't override the method, so just test normal behavior
|
||||
data := []byte("test data")
|
||||
|
||||
n, err := s.output.Write(data)
|
||||
c.Check(err, IsNil)
|
||||
c.Check(n, Equals, len(data))
|
||||
c.Check(err, check.IsNil)
|
||||
c.Check(n, check.Equals, len(data))
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputWriteString(c *C) {
|
||||
func (s *OutputSuite) TestOutputWriteString(c *check.C) {
|
||||
// Test WriteString method
|
||||
text := "hello world"
|
||||
n, err := s.output.WriteString(text)
|
||||
c.Check(err, IsNil)
|
||||
c.Check(n, Equals, len(text))
|
||||
c.Check(s.output.String(), Equals, text)
|
||||
c.Check(err, check.IsNil)
|
||||
c.Check(n, check.Equals, len(text))
|
||||
c.Check(s.output.String(), check.Equals, text)
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputWriteStringMultiple(c *C) {
|
||||
func (s *OutputSuite) TestOutputWriteStringMultiple(c *check.C) {
|
||||
// Test multiple WriteString calls
|
||||
texts := []string{"hello", " ", "world", "!"}
|
||||
|
||||
for _, text := range texts {
|
||||
n, err := s.output.WriteString(text)
|
||||
c.Check(err, IsNil)
|
||||
c.Check(n, Equals, len(text))
|
||||
c.Check(err, check.IsNil)
|
||||
c.Check(n, check.Equals, len(text))
|
||||
}
|
||||
|
||||
c.Check(s.output.String(), Equals, "hello world!")
|
||||
c.Check(s.output.String(), check.Equals, "hello world!")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputWriteStringConcurrent(c *C) {
|
||||
func (s *OutputSuite) TestOutputWriteStringConcurrent(c *check.C) {
|
||||
// Test WriteString with concurrent access
|
||||
var wg sync.WaitGroup
|
||||
|
||||
@@ -135,145 +135,145 @@ func (s *OutputSuite) TestOutputWriteStringConcurrent(c *C) {
|
||||
wg.Wait()
|
||||
|
||||
result := s.output.String()
|
||||
c.Check(len(result), Equals, 5)
|
||||
c.Check(len(result), check.Equals, 5)
|
||||
|
||||
// All characters should be present (order may vary due to concurrency)
|
||||
for _, text := range texts {
|
||||
c.Check(result, Matches, ".*"+text+".*")
|
||||
c.Check(result, check.Matches, ".*"+text+".*")
|
||||
}
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputStart(c *C) {
|
||||
func (s *OutputSuite) TestOutputStart(c *check.C) {
|
||||
// Test Start method (should not panic)
|
||||
s.output.Start()
|
||||
// No assertions needed, just ensure it doesn't panic
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputShutdown(c *C) {
|
||||
func (s *OutputSuite) TestOutputShutdown(c *check.C) {
|
||||
// Test Shutdown method (should not panic)
|
||||
s.output.Shutdown()
|
||||
// No assertions needed, just ensure it doesn't panic
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputFlush(c *C) {
|
||||
func (s *OutputSuite) TestOutputFlush(c *check.C) {
|
||||
// Test Flush method (should not panic)
|
||||
s.output.Flush()
|
||||
// No assertions needed, just ensure it doesn't panic
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputInitBar(c *C) {
|
||||
func (s *OutputSuite) TestOutputInitBar(c *check.C) {
|
||||
// Test InitBar method (should not panic)
|
||||
s.output.InitBar(100, true, aptly.BarPublishGeneratePackageFiles)
|
||||
// No assertions needed, just ensure it doesn't panic
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputShutdownBar(c *C) {
|
||||
func (s *OutputSuite) TestOutputShutdownBar(c *check.C) {
|
||||
// Test ShutdownBar method (should not panic)
|
||||
s.output.ShutdownBar()
|
||||
// No assertions needed, just ensure it doesn't panic
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputAddBar(c *C) {
|
||||
func (s *OutputSuite) TestOutputAddBar(c *check.C) {
|
||||
// Test AddBar method (should not panic)
|
||||
s.output.AddBar(5)
|
||||
// No assertions needed, just ensure it doesn't panic
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputSetBar(c *C) {
|
||||
func (s *OutputSuite) TestOutputSetBar(c *check.C) {
|
||||
// Test SetBar method (should not panic)
|
||||
s.output.SetBar(50)
|
||||
// No assertions needed, just ensure it doesn't panic
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintf(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintf(c *check.C) {
|
||||
// Test Printf method
|
||||
s.output.Printf("Hello %s, number: %d", "world", 42)
|
||||
c.Check(s.output.String(), Equals, "Hello world, number: 42")
|
||||
c.Check(s.output.String(), check.Equals, "Hello world, number: 42")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintfEmpty(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintfEmpty(c *check.C) {
|
||||
// Test Printf with empty format
|
||||
s.output.Printf("")
|
||||
c.Check(s.output.String(), Equals, "")
|
||||
c.Check(s.output.String(), check.Equals, "")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintfNoArgs(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintfNoArgs(c *check.C) {
|
||||
// Test Printf with no arguments
|
||||
s.output.Printf("simple message")
|
||||
c.Check(s.output.String(), Equals, "simple message")
|
||||
c.Check(s.output.String(), check.Equals, "simple message")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintfMultiple(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintfMultiple(c *check.C) {
|
||||
// Test multiple Printf calls
|
||||
s.output.Printf("Line 1: %s", "test")
|
||||
s.output.Printf(" Line 2: %d", 123)
|
||||
c.Check(s.output.String(), Equals, "Line 1: test Line 2: 123")
|
||||
c.Check(s.output.String(), check.Equals, "Line 1: test Line 2: 123")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrint(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrint(c *check.C) {
|
||||
// Test Print method
|
||||
s.output.Print("simple message")
|
||||
c.Check(s.output.String(), Equals, "simple message")
|
||||
c.Check(s.output.String(), check.Equals, "simple message")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintEmpty(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintEmpty(c *check.C) {
|
||||
// Test Print with empty string
|
||||
s.output.Print("")
|
||||
c.Check(s.output.String(), Equals, "")
|
||||
c.Check(s.output.String(), check.Equals, "")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintMultiple(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintMultiple(c *check.C) {
|
||||
// Test multiple Print calls
|
||||
s.output.Print("Hello")
|
||||
s.output.Print(" ")
|
||||
s.output.Print("World")
|
||||
c.Check(s.output.String(), Equals, "Hello World")
|
||||
c.Check(s.output.String(), check.Equals, "Hello World")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputColoredPrintf(c *C) {
|
||||
func (s *OutputSuite) TestOutputColoredPrintf(c *check.C) {
|
||||
// Test ColoredPrintf method (adds newline)
|
||||
s.output.ColoredPrintf("Hello %s", "world")
|
||||
c.Check(s.output.String(), Equals, "Hello world\n")
|
||||
c.Check(s.output.String(), check.Equals, "Hello world\n")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputColoredPrintfEmpty(c *C) {
|
||||
func (s *OutputSuite) TestOutputColoredPrintfEmpty(c *check.C) {
|
||||
// Test ColoredPrintf with empty format
|
||||
s.output.ColoredPrintf("")
|
||||
c.Check(s.output.String(), Equals, "\n")
|
||||
c.Check(s.output.String(), check.Equals, "\n")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputColoredPrintfNoArgs(c *C) {
|
||||
func (s *OutputSuite) TestOutputColoredPrintfNoArgs(c *check.C) {
|
||||
// Test ColoredPrintf with no arguments
|
||||
s.output.ColoredPrintf("simple message")
|
||||
c.Check(s.output.String(), Equals, "simple message\n")
|
||||
c.Check(s.output.String(), check.Equals, "simple message\n")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputColoredPrintfMultiple(c *C) {
|
||||
func (s *OutputSuite) TestOutputColoredPrintfMultiple(c *check.C) {
|
||||
// Test multiple ColoredPrintf calls
|
||||
s.output.ColoredPrintf("Line 1: %s", "test")
|
||||
s.output.ColoredPrintf("Line 2: %d", 123)
|
||||
c.Check(s.output.String(), Equals, "Line 1: test\nLine 2: 123\n")
|
||||
c.Check(s.output.String(), check.Equals, "Line 1: test\nLine 2: 123\n")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintfStdErr(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintfStdErr(c *check.C) {
|
||||
// Test PrintfStdErr method
|
||||
s.output.PrintfStdErr("Error: %s", "something went wrong")
|
||||
c.Check(s.output.String(), Equals, "Error: something went wrong")
|
||||
c.Check(s.output.String(), check.Equals, "Error: something went wrong")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintfStdErrEmpty(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintfStdErrEmpty(c *check.C) {
|
||||
// Test PrintfStdErr with empty format
|
||||
s.output.PrintfStdErr("")
|
||||
c.Check(s.output.String(), Equals, "")
|
||||
c.Check(s.output.String(), check.Equals, "")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputPrintfStdErrNoArgs(c *C) {
|
||||
func (s *OutputSuite) TestOutputPrintfStdErrNoArgs(c *check.C) {
|
||||
// Test PrintfStdErr with no arguments
|
||||
s.output.PrintfStdErr("error message")
|
||||
c.Check(s.output.String(), Equals, "error message")
|
||||
c.Check(s.output.String(), check.Equals, "error message")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputMixedMethods(c *C) {
|
||||
func (s *OutputSuite) TestOutputMixedMethods(c *check.C) {
|
||||
// Test mixing different output methods
|
||||
s.output.Print("Start")
|
||||
s.output.Printf(" %s", "middle")
|
||||
@@ -281,55 +281,55 @@ func (s *OutputSuite) TestOutputMixedMethods(c *C) {
|
||||
s.output.PrintfStdErr("error")
|
||||
|
||||
expected := "Start middle end\nerror"
|
||||
c.Check(s.output.String(), Equals, expected)
|
||||
c.Check(s.output.String(), check.Equals, expected)
|
||||
}
|
||||
|
||||
// PublishOutput tests
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputInitBar(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputInitBar(c *check.C) {
|
||||
// Test InitBar for publish output
|
||||
count := int64(100)
|
||||
s.publishOutput.InitBar(count, false, aptly.BarPublishGeneratePackageFiles)
|
||||
|
||||
c.Check(s.publishOutput.barType, NotNil)
|
||||
c.Check(*s.publishOutput.barType, Equals, aptly.BarPublishGeneratePackageFiles)
|
||||
c.Check(s.publishOutput.TotalNumberOfPackages, Equals, count)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, count)
|
||||
c.Check(s.publishOutput.barType, check.NotNil)
|
||||
c.Check(*s.publishOutput.barType, check.Equals, aptly.BarPublishGeneratePackageFiles)
|
||||
c.Check(s.publishOutput.TotalNumberOfPackages, check.Equals, count)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, count)
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputInitBarOtherType(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputInitBarOtherType(c *check.C) {
|
||||
// Test InitBar for publish output with different bar type
|
||||
count := int64(50)
|
||||
s.publishOutput.InitBar(count, false, aptly.BarGeneralBuildPackageList)
|
||||
|
||||
c.Check(s.publishOutput.barType, NotNil)
|
||||
c.Check(*s.publishOutput.barType, Equals, aptly.BarGeneralBuildPackageList)
|
||||
c.Check(s.publishOutput.barType, check.NotNil)
|
||||
c.Check(*s.publishOutput.barType, check.Equals, aptly.BarGeneralBuildPackageList)
|
||||
// Should not set package counts for other bar types
|
||||
c.Check(s.publishOutput.TotalNumberOfPackages, Equals, int64(0))
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, int64(0))
|
||||
c.Check(s.publishOutput.TotalNumberOfPackages, check.Equals, int64(0))
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, int64(0))
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputShutdownBar(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputShutdownBar(c *check.C) {
|
||||
// Test ShutdownBar for publish output
|
||||
s.publishOutput.barType = &aptly_BarPublishGeneratePackageFiles_ptr
|
||||
s.publishOutput.ShutdownBar()
|
||||
|
||||
c.Check(s.publishOutput.barType, IsNil)
|
||||
c.Check(s.publishOutput.barType, check.IsNil)
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputAddBar(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputAddBar(c *check.C) {
|
||||
// Test AddBar for publish output with correct bar type
|
||||
s.publishOutput.barType = &aptly_BarPublishGeneratePackageFiles_ptr
|
||||
s.publishOutput.RemainingNumberOfPackages = 10
|
||||
|
||||
s.publishOutput.AddBar(1)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, int64(9))
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, int64(9))
|
||||
|
||||
s.publishOutput.AddBar(3) // Still decrements by 1, not 3
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, int64(8))
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, int64(8))
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputAddBarWrongType(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputAddBarWrongType(c *check.C) {
|
||||
// Test AddBar for publish output with wrong bar type
|
||||
otherBarType := aptly.BarGeneralBuildPackageList
|
||||
s.publishOutput.barType = &otherBarType
|
||||
@@ -337,40 +337,40 @@ func (s *OutputSuite) TestPublishOutputAddBarWrongType(c *C) {
|
||||
|
||||
s.publishOutput.AddBar(1)
|
||||
// Should not decrement for wrong bar type
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, int64(10))
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, int64(10))
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputAddBarNilBarType(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputAddBarNilBarType(c *check.C) {
|
||||
// Test AddBar for publish output with nil bar type
|
||||
s.publishOutput.barType = nil
|
||||
s.publishOutput.RemainingNumberOfPackages = 10
|
||||
|
||||
s.publishOutput.AddBar(1)
|
||||
// Should not decrement when bar type is nil
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, int64(10))
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, int64(10))
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputComplete(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputComplete(c *check.C) {
|
||||
// Test complete workflow of publish output
|
||||
count := int64(5)
|
||||
|
||||
// Initialize
|
||||
s.publishOutput.InitBar(count, false, aptly.BarPublishGeneratePackageFiles)
|
||||
c.Check(s.publishOutput.TotalNumberOfPackages, Equals, count)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, count)
|
||||
c.Check(s.publishOutput.TotalNumberOfPackages, check.Equals, count)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, count)
|
||||
|
||||
// Simulate processing packages
|
||||
for i := int64(0); i < count; i++ {
|
||||
s.publishOutput.AddBar(1)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, count-i-1)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, count-i-1)
|
||||
}
|
||||
|
||||
// Shutdown
|
||||
s.publishOutput.ShutdownBar()
|
||||
c.Check(s.publishOutput.barType, IsNil)
|
||||
c.Check(s.publishOutput.barType, check.IsNil)
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputThreadSafety(c *C) {
|
||||
func (s *OutputSuite) TestOutputThreadSafety(c *check.C) {
|
||||
// Test thread safety of all methods
|
||||
var wg sync.WaitGroup
|
||||
numGoroutines := 20
|
||||
@@ -393,11 +393,11 @@ func (s *OutputSuite) TestOutputThreadSafety(c *C) {
|
||||
|
||||
// Should contain all messages without corruption
|
||||
result := s.output.String()
|
||||
c.Check(len(result) > 0, Equals, true)
|
||||
c.Check(len(result) > 0, check.Equals, true)
|
||||
|
||||
// Check that a reasonable amount of output was generated
|
||||
// Each goroutine writes 5 messages, so we should have significant output
|
||||
c.Check(len(result) > numGoroutines*10, Equals, true)
|
||||
c.Check(len(result) > numGoroutines*10, check.Equals, true)
|
||||
|
||||
// Check that some expected message patterns exist (not all, to avoid flakiness)
|
||||
// This verifies basic functionality without being too strict about concurrent ordering
|
||||
@@ -416,15 +416,15 @@ func (s *OutputSuite) TestOutputThreadSafety(c *C) {
|
||||
}
|
||||
}
|
||||
|
||||
c.Check(foundMsg, Equals, true)
|
||||
c.Check(foundPrintf, Equals, true)
|
||||
c.Check(foundStderr, Equals, true)
|
||||
c.Check(foundMsg, check.Equals, true)
|
||||
c.Check(foundPrintf, check.Equals, true)
|
||||
c.Check(foundStderr, check.Equals, true)
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestProgressInterfaceCompliance(c *C) {
|
||||
func (s *OutputSuite) TestProgressInterfaceCompliance(c *check.C) {
|
||||
// Test that Output implements aptly.Progress interface
|
||||
var progress aptly.Progress = s.output
|
||||
c.Check(progress, NotNil)
|
||||
c.Check(progress, check.NotNil)
|
||||
|
||||
// Test calling interface methods
|
||||
progress.Start()
|
||||
@@ -438,10 +438,10 @@ func (s *OutputSuite) TestProgressInterfaceCompliance(c *C) {
|
||||
progress.ColoredPrintf("test %s", "colored")
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputProgressInterfaceCompliance(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputProgressInterfaceCompliance(c *check.C) {
|
||||
// Test that PublishOutput implements aptly.Progress interface
|
||||
var progress aptly.Progress = s.publishOutput
|
||||
c.Check(progress, NotNil)
|
||||
c.Check(progress, check.NotNil)
|
||||
|
||||
// Test calling interface methods
|
||||
progress.InitBar(100, false, aptly.BarPublishGeneratePackageFiles)
|
||||
@@ -451,39 +451,39 @@ func (s *OutputSuite) TestPublishOutputProgressInterfaceCompliance(c *C) {
|
||||
|
||||
// Test edge cases and error scenarios
|
||||
|
||||
func (s *OutputSuite) TestOutputLargeData(c *C) {
|
||||
func (s *OutputSuite) TestOutputLargeData(c *check.C) {
|
||||
// Test with large amounts of data
|
||||
largeString := strings.Repeat("x", 10000)
|
||||
|
||||
n, err := s.output.WriteString(largeString)
|
||||
c.Check(err, IsNil)
|
||||
c.Check(n, Equals, len(largeString))
|
||||
c.Check(s.output.String(), Equals, largeString)
|
||||
c.Check(err, check.IsNil)
|
||||
c.Check(n, check.Equals, len(largeString))
|
||||
c.Check(s.output.String(), check.Equals, largeString)
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestOutputSpecialCharacters(c *C) {
|
||||
func (s *OutputSuite) TestOutputSpecialCharacters(c *check.C) {
|
||||
// Test with special characters and unicode
|
||||
specialString := "Hello L! \n\t\r Special: @#$%^&*()"
|
||||
|
||||
s.output.WriteString(specialString)
|
||||
c.Check(s.output.String(), Equals, specialString)
|
||||
c.Check(s.output.String(), check.Equals, specialString)
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputNegativeAddBar(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputNegativeAddBar(c *check.C) {
|
||||
// Test AddBar with negative values (edge case)
|
||||
s.publishOutput.barType = &aptly_BarPublishGeneratePackageFiles_ptr
|
||||
s.publishOutput.RemainingNumberOfPackages = 5
|
||||
|
||||
// This should still decrement by 1 regardless of the parameter
|
||||
s.publishOutput.AddBar(-10)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, int64(4))
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, int64(4))
|
||||
}
|
||||
|
||||
func (s *OutputSuite) TestPublishOutputZeroAddBar(c *C) {
|
||||
func (s *OutputSuite) TestPublishOutputZeroAddBar(c *check.C) {
|
||||
// Test AddBar with zero value
|
||||
s.publishOutput.barType = &aptly_BarPublishGeneratePackageFiles_ptr
|
||||
s.publishOutput.RemainingNumberOfPackages = 5
|
||||
|
||||
s.publishOutput.AddBar(0)
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, Equals, int64(4))
|
||||
c.Check(s.publishOutput.RemainingNumberOfPackages, check.Equals, int64(4))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user