mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-11-03 14:32:39 +09:00 
			
		
		
		
	Remove all references to Machine.Registered from tests
This commit is contained in:
		@@ -119,7 +119,6 @@ func (s *Suite) TestValidExpandTagOwnersInUsers(c *check.C) {
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		IPAddresses:    MachineAddresses{netaddr.MustParseIP("100.64.0.1")},
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		HostInfo:       datatypes.JSON(hostInfo),
 | 
			
		||||
@@ -163,7 +162,6 @@ func (s *Suite) TestValidExpandTagOwnersInPorts(c *check.C) {
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		IPAddresses:    MachineAddresses{netaddr.MustParseIP("100.64.0.1")},
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		HostInfo:       datatypes.JSON(hostInfo),
 | 
			
		||||
@@ -207,7 +205,6 @@ func (s *Suite) TestInvalidTagValidNamespace(c *check.C) {
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		IPAddresses:    MachineAddresses{netaddr.MustParseIP("100.64.0.1")},
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		HostInfo:       datatypes.JSON(hostInfo),
 | 
			
		||||
@@ -250,7 +247,6 @@ func (s *Suite) TestValidTagInvalidNamespace(c *check.C) {
 | 
			
		||||
		Name:           "webserver",
 | 
			
		||||
		IPAddresses:    MachineAddresses{netaddr.MustParseIP("100.64.0.1")},
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		HostInfo:       datatypes.JSON(hostInfo),
 | 
			
		||||
@@ -267,7 +263,6 @@ func (s *Suite) TestValidTagInvalidNamespace(c *check.C) {
 | 
			
		||||
		Name:           "user",
 | 
			
		||||
		IPAddresses:    MachineAddresses{netaddr.MustParseIP("100.64.0.2")},
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		HostInfo:       datatypes.JSON(hostInfo),
 | 
			
		||||
@@ -345,7 +340,6 @@ func (s *Suite) TestPortNamespace(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    ips,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
@@ -388,7 +382,6 @@ func (s *Suite) TestPortGroup(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    ips,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
 
 | 
			
		||||
@@ -164,7 +164,6 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_1",
 | 
			
		||||
		NamespaceID:    namespaceShared1.ID,
 | 
			
		||||
		Namespace:      *namespaceShared1,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.1")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyInShared1.ID),
 | 
			
		||||
@@ -182,7 +181,6 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_2",
 | 
			
		||||
		NamespaceID:    namespaceShared2.ID,
 | 
			
		||||
		Namespace:      *namespaceShared2,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.2")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyInShared2.ID),
 | 
			
		||||
@@ -200,7 +198,6 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_3",
 | 
			
		||||
		NamespaceID:    namespaceShared3.ID,
 | 
			
		||||
		Namespace:      *namespaceShared3,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.3")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyInShared3.ID),
 | 
			
		||||
@@ -218,7 +215,6 @@ func (s *Suite) TestDNSConfigMapResponseWithMagicDNS(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_4",
 | 
			
		||||
		NamespaceID:    namespaceShared1.ID,
 | 
			
		||||
		Namespace:      *namespaceShared1,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.4")},
 | 
			
		||||
		AuthKeyID:      uint(PreAuthKey2InShared1.ID),
 | 
			
		||||
@@ -311,7 +307,6 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_1",
 | 
			
		||||
		NamespaceID:    namespaceShared1.ID,
 | 
			
		||||
		Namespace:      *namespaceShared1,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.1")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyInShared1.ID),
 | 
			
		||||
@@ -329,7 +324,6 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_2",
 | 
			
		||||
		NamespaceID:    namespaceShared2.ID,
 | 
			
		||||
		Namespace:      *namespaceShared2,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.2")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyInShared2.ID),
 | 
			
		||||
@@ -347,7 +341,6 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_3",
 | 
			
		||||
		NamespaceID:    namespaceShared3.ID,
 | 
			
		||||
		Namespace:      *namespaceShared3,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.3")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyInShared3.ID),
 | 
			
		||||
@@ -365,7 +358,6 @@ func (s *Suite) TestDNSConfigMapResponseWithoutMagicDNS(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_4",
 | 
			
		||||
		NamespaceID:    namespaceShared1.ID,
 | 
			
		||||
		Namespace:      *namespaceShared1,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.4")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKey2InShared1.ID),
 | 
			
		||||
 
 | 
			
		||||
@@ -29,7 +29,6 @@ func (s *Suite) TestGetMachine(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
	}
 | 
			
		||||
@@ -59,7 +58,6 @@ func (s *Suite) TestGetMachineByID(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
	}
 | 
			
		||||
@@ -82,7 +80,6 @@ func (s *Suite) TestDeleteMachine(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(1),
 | 
			
		||||
	}
 | 
			
		||||
@@ -105,7 +102,6 @@ func (s *Suite) TestHardDeleteMachine(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine3",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(1),
 | 
			
		||||
	}
 | 
			
		||||
@@ -136,7 +132,6 @@ func (s *Suite) TestListPeers(c *check.C) {
 | 
			
		||||
			DiscoKey:       "faa" + strconv.Itoa(index),
 | 
			
		||||
			Name:           "testmachine" + strconv.Itoa(index),
 | 
			
		||||
			NamespaceID:    namespace.ID,
 | 
			
		||||
			Registered:     true,
 | 
			
		||||
			RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
			AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		}
 | 
			
		||||
@@ -188,7 +183,6 @@ func (s *Suite) TestGetACLFilteredPeers(c *check.C) {
 | 
			
		||||
			},
 | 
			
		||||
			Name:           "testmachine" + strconv.Itoa(index),
 | 
			
		||||
			NamespaceID:    stor[index%2].namespace.ID,
 | 
			
		||||
			Registered:     true,
 | 
			
		||||
			RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
			AuthKeyID:      uint(stor[index%2].key.ID),
 | 
			
		||||
		}
 | 
			
		||||
@@ -258,7 +252,6 @@ func (s *Suite) TestExpireMachine(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		Expiry:         &time.Time{},
 | 
			
		||||
 
 | 
			
		||||
@@ -54,7 +54,6 @@ func (s *Suite) TestDestroyNamespaceErrors(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
	}
 | 
			
		||||
@@ -146,7 +145,6 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_1",
 | 
			
		||||
		NamespaceID:    namespaceShared1.ID,
 | 
			
		||||
		Namespace:      *namespaceShared1,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.1")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyShared1.ID),
 | 
			
		||||
@@ -164,7 +162,6 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_2",
 | 
			
		||||
		NamespaceID:    namespaceShared2.ID,
 | 
			
		||||
		Namespace:      *namespaceShared2,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.2")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyShared2.ID),
 | 
			
		||||
@@ -182,7 +179,6 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_3",
 | 
			
		||||
		NamespaceID:    namespaceShared3.ID,
 | 
			
		||||
		Namespace:      *namespaceShared3,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.3")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKeyShared3.ID),
 | 
			
		||||
@@ -200,7 +196,6 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 | 
			
		||||
		Name:           "test_get_shared_nodes_4",
 | 
			
		||||
		NamespaceID:    namespaceShared1.ID,
 | 
			
		||||
		Namespace:      *namespaceShared1,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.4")},
 | 
			
		||||
		AuthKeyID:      uint(preAuthKey2Shared1.ID),
 | 
			
		||||
 
 | 
			
		||||
@@ -80,7 +80,6 @@ func (*Suite) TestAlreadyUsedKey(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testest",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
	}
 | 
			
		||||
@@ -105,7 +104,6 @@ func (*Suite) TestReusableBeingUsedKey(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testest",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
	}
 | 
			
		||||
@@ -143,7 +141,6 @@ func (*Suite) TestEphemeralKey(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testest",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		LastSeen:       &now,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
 
 | 
			
		||||
@@ -35,7 +35,6 @@ func (s *Suite) TestGetRoutes(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "test_get_route_machine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		HostInfo:       datatypes.JSON(hostinfo),
 | 
			
		||||
@@ -89,7 +88,6 @@ func (s *Suite) TestGetEnableRoutes(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "test_enable_route_machine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		HostInfo:       datatypes.JSON(hostinfo),
 | 
			
		||||
 
 | 
			
		||||
@@ -36,7 +36,6 @@ func (s *Suite) TestGetUsedIps(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
		IPAddresses:    ips,
 | 
			
		||||
@@ -85,7 +84,6 @@ func (s *Suite) TestGetMultiIp(c *check.C) {
 | 
			
		||||
			DiscoKey:       "faa",
 | 
			
		||||
			Name:           "testmachine",
 | 
			
		||||
			NamespaceID:    namespace.ID,
 | 
			
		||||
			Registered:     true,
 | 
			
		||||
			RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
			AuthKeyID:      uint(pak.ID),
 | 
			
		||||
			IPAddresses:    ips,
 | 
			
		||||
@@ -176,7 +174,6 @@ func (s *Suite) TestGetAvailableIpMachineWithoutIP(c *check.C) {
 | 
			
		||||
		DiscoKey:       "faa",
 | 
			
		||||
		Name:           "testmachine",
 | 
			
		||||
		NamespaceID:    namespace.ID,
 | 
			
		||||
		Registered:     true,
 | 
			
		||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
			
		||||
		AuthKeyID:      uint(pak.ID),
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user