mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-11-04 10:01:05 +01:00 
			
		
		
		
	Move namespaces unit tests to net/netip
This commit is contained in:
		
							parent
							
								
									7af78152a4
								
							
						
					
					
						commit
						64ede5dbef
					
				@ -1,11 +1,11 @@
 | 
				
			|||||||
package headscale
 | 
					package headscale
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
 | 
						"net/netip"
 | 
				
			||||||
	"testing"
 | 
						"testing"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"gopkg.in/check.v1"
 | 
						"gopkg.in/check.v1"
 | 
				
			||||||
	"gorm.io/gorm"
 | 
						"gorm.io/gorm"
 | 
				
			||||||
	"inet.af/netaddr"
 | 
					 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (s *Suite) TestCreateAndDestroyNamespace(c *check.C) {
 | 
					func (s *Suite) TestCreateAndDestroyNamespace(c *check.C) {
 | 
				
			||||||
@ -146,7 +146,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 | 
				
			|||||||
		NamespaceID:    namespaceShared1.ID,
 | 
							NamespaceID:    namespaceShared1.ID,
 | 
				
			||||||
		Namespace:      *namespaceShared1,
 | 
							Namespace:      *namespaceShared1,
 | 
				
			||||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
							RegisterMethod: RegisterMethodAuthKey,
 | 
				
			||||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.1")},
 | 
							IPAddresses:    []netip.Addr{netip.MustParseAddr("100.64.0.1")},
 | 
				
			||||||
		AuthKeyID:      uint(preAuthKeyShared1.ID),
 | 
							AuthKeyID:      uint(preAuthKeyShared1.ID),
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	app.db.Save(machineInShared1)
 | 
						app.db.Save(machineInShared1)
 | 
				
			||||||
@ -163,7 +163,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 | 
				
			|||||||
		NamespaceID:    namespaceShared2.ID,
 | 
							NamespaceID:    namespaceShared2.ID,
 | 
				
			||||||
		Namespace:      *namespaceShared2,
 | 
							Namespace:      *namespaceShared2,
 | 
				
			||||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
							RegisterMethod: RegisterMethodAuthKey,
 | 
				
			||||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.2")},
 | 
							IPAddresses:    []netip.Addr{netip.MustParseAddr("100.64.0.2")},
 | 
				
			||||||
		AuthKeyID:      uint(preAuthKeyShared2.ID),
 | 
							AuthKeyID:      uint(preAuthKeyShared2.ID),
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	app.db.Save(machineInShared2)
 | 
						app.db.Save(machineInShared2)
 | 
				
			||||||
@ -180,7 +180,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 | 
				
			|||||||
		NamespaceID:    namespaceShared3.ID,
 | 
							NamespaceID:    namespaceShared3.ID,
 | 
				
			||||||
		Namespace:      *namespaceShared3,
 | 
							Namespace:      *namespaceShared3,
 | 
				
			||||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
							RegisterMethod: RegisterMethodAuthKey,
 | 
				
			||||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.3")},
 | 
							IPAddresses:    []netip.Addr{netip.MustParseAddr("100.64.0.3")},
 | 
				
			||||||
		AuthKeyID:      uint(preAuthKeyShared3.ID),
 | 
							AuthKeyID:      uint(preAuthKeyShared3.ID),
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	app.db.Save(machineInShared3)
 | 
						app.db.Save(machineInShared3)
 | 
				
			||||||
@ -197,7 +197,7 @@ func (s *Suite) TestGetMapResponseUserProfiles(c *check.C) {
 | 
				
			|||||||
		NamespaceID:    namespaceShared1.ID,
 | 
							NamespaceID:    namespaceShared1.ID,
 | 
				
			||||||
		Namespace:      *namespaceShared1,
 | 
							Namespace:      *namespaceShared1,
 | 
				
			||||||
		RegisterMethod: RegisterMethodAuthKey,
 | 
							RegisterMethod: RegisterMethodAuthKey,
 | 
				
			||||||
		IPAddresses:    []netaddr.IP{netaddr.MustParseIP("100.64.0.4")},
 | 
							IPAddresses:    []netip.Addr{netip.MustParseAddr("100.64.0.4")},
 | 
				
			||||||
		AuthKeyID:      uint(preAuthKey2Shared1.ID),
 | 
							AuthKeyID:      uint(preAuthKey2Shared1.ID),
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	app.db.Save(machine2InShared1)
 | 
						app.db.Save(machine2InShared1)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user