diff --git a/core/generate/context_test.go b/core/generate/context_test.go index 644cb94..5f3b8a2 100644 --- a/core/generate/context_test.go +++ b/core/generate/context_test.go @@ -62,7 +62,8 @@ func TestGenerateContext(t *testing.T) { configJSON := `{ "packages": { "node": "20", - "go": "1.23" + "go": "1.23", + "python": "3.13" }, "aptPackages": ["curl"], "steps": { @@ -114,26 +115,3 @@ func TestGenerateContext(t *testing.T) { snaps.MatchJSON(t, serializedPlan) } - -func TestPython(t *testing.T) { - ctx := CreateTestContext(t, "../../examples/node-npm") - provider := &TestProvider{} - require.NoError(t, provider.Plan(ctx)) - - // User defined config - configJSON := `{ - "packages": { - "python": "3.11" - } - }` - - var cfg config.Config - require.NoError(t, json.Unmarshal([]byte(configJSON), &cfg)) - - // Apply the config to the context - require.NoError(t, ctx.ApplyConfig(&cfg)) - - // Resolve packages - _, err := ctx.ResolvePackages() - require.NoError(t, err) -} diff --git a/core/resolver/resolver_test.go b/core/resolver/resolver_test.go index 2c8d829..0cc9247 100644 --- a/core/resolver/resolver_test.go +++ b/core/resolver/resolver_test.go @@ -34,6 +34,11 @@ func TestPackageResolver(t *testing.T) { resolver.Version(golang, "1.22", "GO_VERSION environment variable") resolver.Version(golang, "1.23", ".go-version") + // Set up Python + python := resolver.Default("python", "3.11") + resolver.Version(python, "3.12", "PYTHON_VERSION environment variable") + resolver.Version(python, "3.13", ".python-version") + // Resolve all packages resolvedPackages, err := resolver.ResolvePackages() require.NoError(t, err) @@ -54,6 +59,12 @@ func TestPackageResolver(t *testing.T) { require.NotNil(t, goResolved) require.NotNil(t, goResolved.ResolvedVersion) assert.Contains(t, *goResolved.ResolvedVersion, "1.23") + + // Check Python resolution + pythonResolved := resolvedPackages["python"] + require.NotNil(t, pythonResolved) + require.NotNil(t, pythonResolved.ResolvedVersion) + assert.Contains(t, *pythonResolved.ResolvedVersion, "3.13") } func TestPackageResolverWithPreviousVersions(t *testing.T) { @@ -80,17 +91,3 @@ func TestPackageResolverWithPreviousVersions(t *testing.T) { assert.Equal(t, "1.23", pkg.Version) assert.Equal(t, DefaultSource, pkg.Source) } - -func PythonTest1(t *testing.T) { - resolver, err := NewResolver(mise.TestInstallDir) - require.NoError(t, err) - - resolver.Default("python", "3.11") - pkg := resolver.Get("python") - assert.Equal(t, "3.11", pkg.Version) - assert.Equal(t, DefaultSource, pkg.Source) - - resolvedPackages, err := resolver.ResolvePackages() - require.NoError(t, err) - assert.Equal(t, 1, len(resolvedPackages)) -}